Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/271019
Change subject: Don't configure a secondary labs salt master on new labs
instances.
......................................................................
Don't configure a secondary labs salt master on new labs instances.
Salt multimaster is unreliable, plus the secondary we were using
(labs-puppetmaster-codfw) doesn't exist anymore.
Bug: T126580
Change-Id: If37adce29dae1abecffbf83038fe053ce3d9d5f5
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/271019/1
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 22baa2a..05465ef 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -75,12 +75,10 @@
if [ "${domain}" == "eqiad.wmflabs" ]
then
master="labs-puppetmaster-eqiad.wikimedia.org"
- master_secondary="labs-puppetmaster-codfw.wikimedia.org"
fi
if [ "${domain}" == "codfw.wmflabs" ]
then
master="labs-puppetmaster-codfw.wikimedia.org"
- master_secondary="labs-puppetmaster-eqiad.wikimedia.org"
fi
# Finish LDAP configuration
@@ -124,7 +122,7 @@
echo $fqdn > /etc/mailname
# Initial salt config
-echo -e "master:\n - ${master}\n - ${master_secondary}" > /etc/salt/minion
+echo -e "master: ${master}" > /etc/salt/minion
echo "id: ${fqdn}" >> /etc/salt/minion
echo "master_finger: ${saltfinger}" >> /etc/salt/minion
echo "${fqdn}" > /etc/salt/minion_id
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index bffd855..0b62c76 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -51,12 +51,10 @@
if [ "${domain}" == "eqiad.wmflabs" ]
then
master="labs-puppetmaster-eqiad.wikimedia.org"
- master_secondary="labs-puppetmaster-codfw.wikimedia.org"
fi
if [ "${domain}" == "codfw.wmflabs" ]
then
master="labs-puppetmaster-codfw.wikimedia.org"
- master_secondary="labs-puppetmaster-eqiad.wikimedia.org"
fi
# Finish LDAP configuration
@@ -96,7 +94,7 @@
echo $fqdn > /etc/mailname
# Initial salt config
-echo -e "master:\n - ${master}\n - ${master_secondary}" > /etc/salt/minion
+echo -e "master: ${master}\n" > /etc/salt/minion
echo "id: ${fqdn}" >> /etc/salt/minion
echo "master_finger: ${saltfinger}" >> /etc/salt/minion
echo "${fqdn}" > /etc/salt/minion_id
--
To view, visit https://gerrit.wikimedia.org/r/271019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If37adce29dae1abecffbf83038fe053ce3d9d5f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
