Volans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310587
Change subject: Salt: use puppetmaster CNAME
......................................................................
Salt: use puppetmaster CNAME
Bug: T143536
Change-Id: I468a0d4098277425916383ec74d43b5266b61c50
---
M modules/salt/files/wmf_auto_reimage.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/310587/1
diff --git a/modules/salt/files/wmf_auto_reimage.py
b/modules/salt/files/wmf_auto_reimage.py
index ab9148a..74ccb53 100644
--- a/modules/salt/files/wmf_auto_reimage.py
+++ b/modules/salt/files/wmf_auto_reimage.py
@@ -21,7 +21,7 @@
from phabricator import Phabricator
ICINGA_DOMAIN = 'icinga.wikimedia.org'
-PUPPET_DOMAIN = '_x-puppet._tcp.eqiad.wmnet'
+PUPPET_DOMAIN = 'puppet.wikimedia.org'
DEPLOYMENT_DOMAIN = 'deployment.eqiad.wmnet'
INTERNAL_TLD = 'wmnet'
MANAGEMENT_DOMAIN = 'mgmt'
@@ -943,7 +943,7 @@
ipmi_password = get_ipmi_password()
custom_mgmts = get_custom_mgmts(args.hosts)
icinga_host = resolve_dns(ICINGA_DOMAIN, 'CNAME')
- puppetmaster_host = resolve_dns(PUPPET_DOMAIN, 'SRV')
+ puppetmaster_host = resolve_dns(PUPPET_DOMAIN, 'CNAME')
deployment_host = resolve_dns(DEPLOYMENT_DOMAIN, 'CNAME')
phab_client = get_phabricator_client()
hosts = args.hosts
--
To view, visit https://gerrit.wikimedia.org/r/310587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I468a0d4098277425916383ec74d43b5266b61c50
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
