[MediaWiki-commits] [Gerrit] remove db100[2-7] from install_server and coredb - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: remove db100[2-7] from install_server and coredb
..
remove db100[2-7] from install_server and coredb
old servers which no longer should be in production. Don't exist in site.pp
and have no use anymore.
Change-Id: Ia146891f7c2946ebc4d846567171915a1b831d3e
---
M manifests/role/coredb.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 13 insertions(+), 43 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 74787b8..ce757a0 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -15,46 +15,46 @@
'no_master'=> [ 'db1050', 'db1055' ]
},
's2' => {
-'hosts' => { 'eqiad' => [ 'db1002', 'db1009', 'db1018', 'db1024',
'db1036', 'db1060', 'db1063', 'db1067' ] },
+'hosts' => { 'eqiad' => [ 'db1009', 'db1018', 'db1024', 'db1036',
'db1060', 'db1063', 'db1067' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1024' },
'snapshot' => [ 'db1018' ],
-'no_master'=> [ 'db1002', 'db1018' ]
+'no_master'=> [ 'db1018' ]
},
's3' => {
-'hosts' => { 'eqiad' => [ 'db1003', 'db1019', 'db1027', 'db1035',
'db1038' ] },
+'hosts' => { 'eqiad' => [ 'db1019', 'db1027', 'db1035', 'db1038' ]
},
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1038' },
'snapshot' => [ 'db1035' ],
-'no_master'=> [ 'db1003', 'db1035' ]
+'no_master'=> [ 'db1035' ]
},
's4' => {
-'hosts' => { 'eqiad' => [ 'db1004', 'db1040', 'db1042', 'db1056',
'db1059', 'db1064', 'db1068' ] },
+'hosts' => { 'eqiad' => [ 'db1040', 'db1042', 'db1056', 'db1059',
'db1064', 'db1068' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1040' },
'snapshot' => [ 'db1042' ],
-'no_master'=> [ 'db1004', 'db1042' ]
+'no_master'=> [ 'db1042' ]
},
's5' => {
-'hosts' => { 'eqiad' => [ 'db1005', 'db1021', 'db1026', 'db1037',
'db1045', 'db1049', 'db1058' ] },
+'hosts' => { 'eqiad' => [ 'db1021', 'db1026', 'db1037', 'db1045',
'db1049', 'db1058' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1058' },
-'snapshot' => [ 'db1005' ],
-'no_master'=> [ 'db1005', 'db1026' ]
+'snapshot' => [ ],
+'no_master'=> [ 'db1026' ]
},
's6' => {
-'hosts' => { 'eqiad' => [ 'db1006', 'db1010', 'db1015', 'db1022',
'db1023', 'db1030' ] },
+'hosts' => { 'eqiad' => [ 'db1010', 'db1015', 'db1022', 'db1023',
'db1030' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1023' },
'snapshot' => [ 'db1022' ],
'no_master'=> [ 'db1022', 'db1010' ]
},
's7' => {
-'hosts' => { 'eqiad' => [ 'db1007', 'db1028', 'db1033', 'db1034',
'db1039', 'db1041' ] },
+'hosts' => { 'eqiad' => [ 'db1028', 'db1033', 'db1034', 'db1039',
'db1041' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1033' },
-'snapshot' => [ 'db1007' ],
-'no_master'=> [ 'db1007', 'db1041' ]
+'snapshot' => [ ],
+'no_master'=> [ 'db1041' ]
},
'x1' => {
'hosts' => {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 777df2d..e61ec55 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1194,36 +1194,6 @@
fixed-address db1001.eqiad.wmnet;
}
-host db1002 {
- hardware ethernet 78:2b:cb:03:63:4b;
- fixed-address db1002.eqiad.wmnet;
-}
-
-host db1003 {
- hardware ethernet 78:2b:cb:05:02:e3;
- fixed-address db1003.eqiad.wmnet;
-}
-
-host db1004 {
- hardware ethernet 78:2b:cb:03:cc:bc;
- fixed-address db1004.eqiad.wmnet;
-}
-
-host db1005 {
- hardware ethernet 78:2b:cb:03:60:f9;
- fixed-address db1005.eqiad.wmnet;
-}
-
-host db1006 {
- hardware ethernet 78:2b:cb:03:64:8f;
- fixed-address db1006.eqiad.wmnet;
-}
-
-host db1007 {
- hardware ethernet 78:2b:cb:04:da:0b;
- fixed-address db1007.eqiad.wmnet;
-}
-
host db1009 {
hardware ethernet 78:2b:cb:0a:04:1b;
fixed-address db1009.eqiad.wmnet;
-
[MediaWiki-commits] [Gerrit] remove db100[2-7] from install_server and coredb - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224558
Change subject: remove db100[2-7] from install_server and coredb
..
remove db100[2-7] from install_server and coredb
old servers which no longer should be in production. Don't exist in site.pp
and have no use anymore.
Change-Id: Ia146891f7c2946ebc4d846567171915a1b831d3e
---
M manifests/role/coredb.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 13 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/224558/1
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 74787b8..ce757a0 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -15,46 +15,46 @@
'no_master'=> [ 'db1050', 'db1055' ]
},
's2' => {
-'hosts' => { 'eqiad' => [ 'db1002', 'db1009', 'db1018', 'db1024',
'db1036', 'db1060', 'db1063', 'db1067' ] },
+'hosts' => { 'eqiad' => [ 'db1009', 'db1018', 'db1024', 'db1036',
'db1060', 'db1063', 'db1067' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1024' },
'snapshot' => [ 'db1018' ],
-'no_master'=> [ 'db1002', 'db1018' ]
+'no_master'=> [ 'db1018' ]
},
's3' => {
-'hosts' => { 'eqiad' => [ 'db1003', 'db1019', 'db1027', 'db1035',
'db1038' ] },
+'hosts' => { 'eqiad' => [ 'db1019', 'db1027', 'db1035', 'db1038' ]
},
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1038' },
'snapshot' => [ 'db1035' ],
-'no_master'=> [ 'db1003', 'db1035' ]
+'no_master'=> [ 'db1035' ]
},
's4' => {
-'hosts' => { 'eqiad' => [ 'db1004', 'db1040', 'db1042', 'db1056',
'db1059', 'db1064', 'db1068' ] },
+'hosts' => { 'eqiad' => [ 'db1040', 'db1042', 'db1056', 'db1059',
'db1064', 'db1068' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1040' },
'snapshot' => [ 'db1042' ],
-'no_master'=> [ 'db1004', 'db1042' ]
+'no_master'=> [ 'db1042' ]
},
's5' => {
-'hosts' => { 'eqiad' => [ 'db1005', 'db1021', 'db1026', 'db1037',
'db1045', 'db1049', 'db1058' ] },
+'hosts' => { 'eqiad' => [ 'db1021', 'db1026', 'db1037', 'db1045',
'db1049', 'db1058' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1058' },
-'snapshot' => [ 'db1005' ],
-'no_master'=> [ 'db1005', 'db1026' ]
+'snapshot' => [ ],
+'no_master'=> [ 'db1026' ]
},
's6' => {
-'hosts' => { 'eqiad' => [ 'db1006', 'db1010', 'db1015', 'db1022',
'db1023', 'db1030' ] },
+'hosts' => { 'eqiad' => [ 'db1010', 'db1015', 'db1022', 'db1023',
'db1030' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1023' },
'snapshot' => [ 'db1022' ],
'no_master'=> [ 'db1022', 'db1010' ]
},
's7' => {
-'hosts' => { 'eqiad' => [ 'db1007', 'db1028', 'db1033', 'db1034',
'db1039', 'db1041' ] },
+'hosts' => { 'eqiad' => [ 'db1028', 'db1033', 'db1034', 'db1039',
'db1041' ] },
'primary_site' => $::mw_primary,
'masters' => { 'eqiad' => 'db1033' },
-'snapshot' => [ 'db1007' ],
-'no_master'=> [ 'db1007', 'db1041' ]
+'snapshot' => [ ],
+'no_master'=> [ 'db1041' ]
},
'x1' => {
'hosts' => {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 15cdaf9..785f406 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1140,36 +1140,6 @@
fixed-address db1001.eqiad.wmnet;
}
-host db1002 {
- hardware ethernet 78:2b:cb:03:63:4b;
- fixed-address db1002.eqiad.wmnet;
-}
-
-host db1003 {
- hardware ethernet 78:2b:cb:05:02:e3;
- fixed-address db1003.eqiad.wmnet;
-}
-
-host db1004 {
- hardware ethernet 78:2b:cb:03:cc:bc;
- fixed-address db1004.eqiad.wmnet;
-}
-
-host db1005 {
- hardware ethernet 78:2b:cb:03:60:f9;
- fixed-address db1005.eqiad.wmnet;
-}
-
-host db1006 {
- hardware ethernet 78:2b:cb:03:64:8f;
- fixed-address db1006.eqiad.wmnet;
-}
-
-host db1007 {
- hardware ethernet 78:2b:cb:04:da:0b;
- fixed-address db1007.eqiad.wmnet;
-}
-
host db1009 {
hardware ethernet 78:2b:cb:0a:04:1b;
