Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204259
Change subject: Move the keystone token cron into openstack::database-server
......................................................................
Move the keystone token cron into openstack::database-server
It depended on values that weren't set in
openstack::database-server::mysql where it was defined before.
Change-Id: I3f8981958c729af9dd851739a2580755c9921f1c
---
M modules/openstack/manifests/database-server.pp
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/204259/1
diff --git a/modules/openstack/manifests/database-server.pp
b/modules/openstack/manifests/database-server.pp
index ac09d54..b81d8fd 100644
--- a/modules/openstack/manifests/database-server.pp
+++ b/modules/openstack/manifests/database-server.pp
@@ -137,6 +137,16 @@
command => 'find /a/backup -type f -mtime +4 -delete',
require => File['/a/backup'];
}
+
+ # Clean up expired keystone tokens, because keystone seems to leak them
+ cron {
+ 'run-jobs':
+ user => 'root',
+ hour => 8,
+ minute => 0,
+ ensure => present,
+ command => "/usr/bin/mysql $keystone_db_name -u${keystone_db_user}
-p${keystone_db_pass} -e 'DELETE FROM token WHERE NOT
DATE_SUB(CURDATE(),INTERVAL 2 DAY) <= expires;'",
+ }
}
class openstack::database-server::mysql($controller_mysql_root_pass) {
@@ -173,13 +183,4 @@
require => [Class['mysql::server::package'],
File['/etc/nova/mysql.sql']];
}
- # Clean up expired keystone tokens, because keystone seems to leak them
- cron {
- 'run-jobs':
- user => 'root',
- hour => 8,
- minute => 0,
- ensure => present,
- command => "/usr/bin/mysql $keystone_db_name -u${keystone_db_user}
-p${keystone_db_pass} -e 'DELETE FROM token WHERE NOT
DATE_SUB(CURDATE(),INTERVAL 2 DAY) <= expires;'",
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/204259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f8981958c729af9dd851739a2580755c9921f1c
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
