Switch for Keystone DB cron job

- Adds parameter to enable switching off token flush cron job.
- Sets destination for deleted rows to /dev/null

Change-Id: I9e8aed969e81595d8a1d0a5300da17da6ba15c03
Partial-bug: rhbz#1249106
Depends-On: I5e51562338f68b4ba1b2e942907e6f6a0ab7a61e
This commit is contained in:
Martin Mágr 2015-08-05 16:28:04 +02:00
parent 891e5efd25
commit 31b05b17bf
4 changed files with 16 additions and 2 deletions

View File

@ -276,6 +276,11 @@ parameters:
default: ''
description: Keystone self-signed certificate authority certificate.
type: string
KeystoneEnableDBPurge:
default: true
description: |
Whether to create cron job for purging soft deleted rows in Keystone database.
type: boolean
KeystoneSigningCertificate:
default: ''
description: Keystone certificate for verifying token validity.
@ -943,6 +948,7 @@ resources:
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}
keystone_notification_driver: {get_param: KeystoneNotificationDriver}
keystone_notification_format: {get_param: KeystoneNotificationFormat}
keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
keystone_dsn:
list_join:
- ''
@ -1329,6 +1335,7 @@ resources:
keystone::endpoint::region: {get_input: keystone_region}
keystone::admin_workers: {get_input: keystone_workers}
keystone::public_workers: {get_input: keystone_workers}
keystone_enable_db_purge: {get_input: keystone_enable_db_purge}
# MongoDB
mongodb::server::bind_ip: {get_input: mongo_db_network}

View File

@ -43,6 +43,7 @@ heat::keystone_tenant: 'service'
keystone::cron::token_flush::maxdelay: 3600
keystone::roles::admin::service_tenant: 'service'
keystone::roles::admin::admin_tenant: 'admin'
keystone::cron::token_flush::destination: '/dev/null'
#swift
swift::proxy::pipeline:

View File

@ -592,10 +592,13 @@ if hiera('step') >= 3 {
} #END STEP 3
if hiera('step') >= 4 {
$keystone_enable_db_purge = hiera('keystone_enable_db_purge', true)
$nova_enable_db_purge = hiera('nova_enable_db_purge', true)
$cinder_enable_db_purge = hiera('cinder_enable_db_purge', true)
include ::keystone::cron::token_flush
if $keystone_enable_db_purge {
include ::keystone::cron::token_flush
}
if $nova_enable_db_purge {
include ::nova::cron::archive_deleted_rows
}

View File

@ -1012,10 +1012,13 @@ if hiera('step') >= 3 {
} #END STEP 3
if hiera('step') >= 4 {
$keystone_enable_db_purge = hiera('keystone_enable_db_purge', true)
$nova_enable_db_purge = hiera('nova_enable_db_purge', true)
$cinder_enable_db_purge = hiera('cinder_enable_db_purge', true)
include ::keystone::cron::token_flush
if $keystone_enable_db_purge {
include ::keystone::cron::token_flush
}
if $nova_enable_db_purge {
include ::nova::cron::archive_deleted_rows
}