[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove db1041

2017-08-23 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373282 )

Change subject: mariadb: Remove db1041
..

mariadb: Remove db1041

db1041 is going to be decomissioned

Bug: T173915
Change-Id: I472849e7deba92fd2799b32275c14baa402fb14e
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 7 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/373282/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2bb8b99..2df9fec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -527,10 +527,16 @@
 role(mariadb::core)
 }
 
-node /^db10(28|33|34|39|41|79|86|94)\.eqiad\.wmnet/ {
+node /^db10(28|33|34|39|79|86|94)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
+# To be decommissioned in T173915
+node 'db1041.eqiad.wmnet' {
+role(spare::system)
+}
+
+
 # s7 (centralauth, meta et al.) core production dbs on codfw
 # codfw master
 node 'db2029.codfw.wmnet' {
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 efbed07..c592113 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1023,13 +1023,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host db1041 {
-hardware ethernet 78:2b:cb:03:6f:71;
-fixed-address db1041.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1043 {
 hardware ethernet 78:2b:cb:03:dd:3b;
 fixed-address db1043.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 4f49a8e..6252cf1 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -111,7 +111,6 @@
   - db1033:9104
   - db1034:9104
   - db1039:9104
-  - db1041:9104
   - db1079:9104
   - db1086:9104
   - db1094:9104

-- 
To view, visit https://gerrit.wikimedia.org/r/373282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I472849e7deba92fd2799b32275c14baa402fb14e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove db1041

2017-08-23 Thread Marostegui (Code Review)
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373282 )

Change subject: mariadb: Remove db1041
..


mariadb: Remove db1041

db1041 is going to be decomissioned

Bug: T173915
Change-Id: I472849e7deba92fd2799b32275c14baa402fb14e
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 7 insertions(+), 9 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 2bb8b99..2df9fec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -527,10 +527,16 @@
 role(mariadb::core)
 }
 
-node /^db10(28|33|34|39|41|79|86|94)\.eqiad\.wmnet/ {
+node /^db10(28|33|34|39|79|86|94)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
+# To be decommissioned in T173915
+node 'db1041.eqiad.wmnet' {
+role(spare::system)
+}
+
+
 # s7 (centralauth, meta et al.) core production dbs on codfw
 # codfw master
 node 'db2029.codfw.wmnet' {
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 efbed07..c592113 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1023,13 +1023,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host db1041 {
-hardware ethernet 78:2b:cb:03:6f:71;
-fixed-address db1041.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1043 {
 hardware ethernet 78:2b:cb:03:dd:3b;
 fixed-address db1043.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 4f49a8e..6252cf1 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -111,7 +111,6 @@
   - db1033:9104
   - db1034:9104
   - db1039:9104
-  - db1041:9104
   - db1079:9104
   - db1086:9104
   - db1094:9104

-- 
To view, visit https://gerrit.wikimedia.org/r/373282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I472849e7deba92fd2799b32275c14baa402fb14e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits