Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405673 )
Change subject: mariadb: Move db1063 to s6
......................................................................
mariadb: Move db1063 to s6
db1063 will be replacing db1030 as vslow in s6.
Also removing db1113 and db1114 from the installation as they are now as
spares
Bug: T184397
Change-Id: Ic8a385b51d154e5824155e0319d24c01a62d3597
---
M hieradata/hosts/db1063.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
5 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1063.yaml b/hieradata/hosts/db1063.yaml
index 8b1f532..ca2abb9 100644
--- a/hieradata/hosts/db1063.yaml
+++ b/hieradata/hosts/db1063.yaml
@@ -1,2 +1,2 @@
-mariadb::shard: 's8'
+mariadb::shard: 's6'
profile::base::notifications_enabled: '0'
diff --git a/manifests/site.pp b/manifests/site.pp
index af5c111..2205aa3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -397,7 +397,7 @@
}
# See also db1096 and db1098 below
-node /^db10(30|85|88|93)\.eqiad\.wmnet/ {
+node /^db10(30|63|85|88|93)\.eqiad\.wmnet/ {
role(mariadb::core)
}
@@ -449,7 +449,7 @@
}
# See also db1099 and db1101 below
-node /^db1(063|104|092|087|109)\.eqiad\.wmnet/ {
+node /^db1(104|092|087|109)\.eqiad\.wmnet/ {
role(mariadb::core)
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index d00ac95..dde5343 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -66,7 +66,7 @@
conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
- db111[3-4]) echo partman/db.cfg ;; \
+ db1063 echo partman/db.cfg ;; \
db2036|db2034|db2078|db2090|db2092) echo partman/db.cfg ;; \
db[12][01][0-9][0-9]|dbstore[12]00[1-9]|es[12]01[1-9]) echo
partman/db-no-srv-format.cfg ;; \
deploy[12]001|flerovium|furud) echo
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
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 8d275ba..e31150b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1368,8 +1368,6 @@
host db1063 {
hardware ethernet C8:1F:66:B8:1A:40;
fixed-address db1063.eqiad.wmnet;
- option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
- filename "lpxelinux.0";
}
host db1064 {
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 1bebb01..1676549 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -85,6 +85,7 @@
role: slave
targets:
- db1030:9104
+ - db1063:9104
- db1085:9104
- db1088:9104
- db1093:9104
@@ -116,7 +117,6 @@
shard: s8
role: slave
targets:
- - db1063:9104
- db1087:9104
- db1092:9104
- db1099:13318
--
To view, visit https://gerrit.wikimedia.org/r/405673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a385b51d154e5824155e0319d24c01a62d3597
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
