Andrew Bogott has submitted this change and it was merged.
Change subject: OpenStack: Turn off keystone service and cron on spare
controller.
......................................................................
OpenStack: Turn off keystone service and cron on spare controller.
Change-Id: I0f5a5ed6b04f230f108276eeaa0df4df09c168ab
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 24 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index b503fc3..f4a32b5 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -12,12 +12,6 @@
}
}
- service { 'keystone':
- ensure => running,
- subscribe => File['/etc/keystone/keystone.conf'],
- require => Package['keystone'];
- }
-
file {
'/etc/keystone/keystone.conf':
content =>
template("openstack/${openstack_version}/keystone/keystone.conf.erb"),
@@ -28,16 +22,29 @@
mode => '0440';
}
- # Clean up expired keystone tokens, because keystone seems to leak them
- $keystone_db_name = $keystoneconfig['db_name']
- $keystone_db_user = $keystoneconfig['db_user']
- $keystone_db_pass = $keystoneconfig['db_pass']
- $keystone_db_host = $keystoneconfig['db_host']
- cron {
- 'cleanup_expired_keystone_tokens':
- user => 'root',
- minute => 20,
- ensure => present,
- command => "/usr/bin/mysql $keystone_db_name -h${keystone_db_host}
-u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE FROM token WHERE NOW() -
INTERVAL 2 day > expires LIMIT 10000;'",
+ if $::fqdn == hiera('labs_nova_controller') {
+ service { 'keystone':
+ ensure => running,
+ subscribe => File['/etc/keystone/keystone.conf'],
+ require => Package['keystone'];
+ }
+
+ # Clean up expired keystone tokens, because keystone seems to leak them
+ $keystone_db_name = $keystoneconfig['db_name']
+ $keystone_db_user = $keystoneconfig['db_user']
+ $keystone_db_pass = $keystoneconfig['db_pass']
+ $keystone_db_host = $keystoneconfig['db_host']
+ cron {
+ 'cleanup_expired_keystone_tokens':
+ user => 'root',
+ minute => 20,
+ ensure => present,
+ command => "/usr/bin/mysql $keystone_db_name
-h${keystone_db_host} -u${keystone_db_user} -p${keystone_db_pass} -e 'DELETE
FROM token WHERE NOW() - INTERVAL 2 day > expires LIMIT 10000;'",
+ }
+ } else {
+ service { 'keystone':
+ ensure => stopped,
+ require => Package['keystone'];
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/238812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f5a5ed6b04f230f108276eeaa0df4df09c168ab
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
