[MediaWiki-commits] [Gerrit] labs key monitor/delete script: don't rotate saltmaster aes ... - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: labs key monitor/delete script: don't rotate saltmaster aes key on key deletion .. labs key monitor/delete script: don't rotate saltmaster aes key on key deletion Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6 --- M modules/openstack/files/monitor_labs_salt_keys.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/files/monitor_labs_salt_keys.py b/modules/openstack/files/monitor_labs_salt_keys.py index dc017a1..4b8af49 100644 --- a/modules/openstack/files/monitor_labs_salt_keys.py +++ b/modules/openstack/files/monitor_labs_salt_keys.py @@ -195,6 +195,8 @@ client will wait for the minion response ''' self.client = salt.client.LocalClient() +# don't rotate saltmaster aes key on salt key deletion +self.client.opts['rotate_aes_key'] = False self.all_keys = None self.accepted_keys = None self.key_manager = salt.key.Key(self.client.opts) -- To view, visit https://gerrit.wikimedia.org/r/238151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn Gerrit-Reviewer: ArielGlenn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs key monitor/delete script: don't rotate saltmaster aes ... - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/238151 Change subject: labs key monitor/delete script: don't rotate saltmaster aes key on key deletion .. labs key monitor/delete script: don't rotate saltmaster aes key on key deletion Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6 --- M modules/openstack/files/monitor_labs_salt_keys.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/238151/1 diff --git a/modules/openstack/files/monitor_labs_salt_keys.py b/modules/openstack/files/monitor_labs_salt_keys.py index dc017a1..4b8af49 100644 --- a/modules/openstack/files/monitor_labs_salt_keys.py +++ b/modules/openstack/files/monitor_labs_salt_keys.py @@ -195,6 +195,8 @@ client will wait for the minion response ''' self.client = salt.client.LocalClient() +# don't rotate saltmaster aes key on salt key deletion +self.client.opts['rotate_aes_key'] = False self.all_keys = None self.accepted_keys = None self.key_manager = salt.key.Key(self.client.opts) -- To view, visit https://gerrit.wikimedia.org/r/238151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
