Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381203 )
Change subject: Remove salt references in openstack liberty wmfsink
......................................................................
Remove salt references in openstack liberty wmfsink
Change-Id: I1d187fdbfaefd0bb7cfbe7b734e4a2fccadb9918
---
M modules/openstack2/files/liberty/designate/wmf_sink/base.py
M modules/openstack2/files/liberty/designate/wmf_sink/wmfsink.py
M modules/openstack2/templates/liberty/designate/designate.conf.erb
3 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/381203/1
diff --git a/modules/openstack2/files/liberty/designate/wmf_sink/base.py
b/modules/openstack2/files/liberty/designate/wmf_sink/base.py
index 74bd577..f65b693 100644
--- a/modules/openstack2/files/liberty/designate/wmf_sink/base.py
+++ b/modules/openstack2/files/liberty/designate/wmf_sink/base.py
@@ -54,19 +54,12 @@
fqdn = cfg.CONF[self.name].fqdn_format % event_data
fqdn = fqdn.rstrip('.').encode('utf8')
- # Clean salt and puppet keys for deleted instance
+ # Clean puppet keys for deleted instance
if cfg.CONF[self.name].puppet_master_host:
LOG.debug('Cleaning puppet key %s' % fqdn)
self._run_remote_command(cfg.CONF[self.name].puppet_master_host,
cfg.CONF[self.name].certmanager_user,
'sudo puppet cert clean %s' %
- pipes.quote(fqdn))
-
- if cfg.CONF[self.name].salt_master_host:
- LOG.debug('Cleaning salt key %s' % fqdn)
- self._run_remote_command(cfg.CONF[self.name].salt_master_host,
- cfg.CONF[self.name].certmanager_user,
- 'sudo salt-key -y -d %s' %
pipes.quote(fqdn))
# Clean up the puppet config for this instance, if there is one
diff --git a/modules/openstack2/files/liberty/designate/wmf_sink/wmfsink.py
b/modules/openstack2/files/liberty/designate/wmf_sink/wmfsink.py
index d37c87e..40b4504 100644
--- a/modules/openstack2/files/liberty/designate/wmf_sink/wmfsink.py
+++ b/modules/openstack2/files/liberty/designate/wmf_sink/wmfsink.py
@@ -40,7 +40,6 @@
cfg.StrOpt('certmanager_user', default='certmanager'),
cfg.StrOpt('fqdn_format', default=None),
cfg.StrOpt('puppet_master_host', default=None),
- cfg.StrOpt('salt_master_host', default=None),
cfg.StrOpt('puppet_config_backend', default=None),
], group='handler:wmf_sink')
diff --git a/modules/openstack2/templates/liberty/designate/designate.conf.erb
b/modules/openstack2/templates/liberty/designate/designate.conf.erb
index c8c0fa0..8ac585c 100644
--- a/modules/openstack2/templates/liberty/designate/designate.conf.erb
+++ b/modules/openstack2/templates/liberty/designate/designate.conf.erb
@@ -294,7 +294,7 @@
#-----------------------
# WMF-specific handler to clean up after instance deletion
#
-# this deletes puppet and salt certs for the deleted instance.
+# this deletes puppet certs for the deleted instance.
#-----------------------
[handler:wmf_sink]
# Domain ID of domain for instances.
@@ -307,7 +307,6 @@
certmanager_user = certmanager
fqdn_format = '%(hostname)s.%(project_name)s.%(domain)s'
puppet_master_host = "<%= @puppetmaster_hostname_ip %>"
-salt_master_host = "<%= @nova_controller %>"
puppet_config_backend = "http://<%= @puppetmaster_hostname %>:8101/v1"
#------------------------
--
To view, visit https://gerrit.wikimedia.org/r/381203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d187fdbfaefd0bb7cfbe7b734e4a2fccadb9918
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
