From d1f535cc5249f7bfc89155e75f589c55d26e20da Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Tue, 3 May 2016 11:04:40 +0200
Subject: [PATCH] Add token flushing for Keystone and rows archiving for Nova

This change enables token flushing for Keystone and rows archiving
for Nova in the undercloud, as it do for Heat already.

Change-Id: If2803de46b476899423ce60923aa723a2513604c
(cherry picked from commit dde13f2b381aa01ac391dc4656c52a3ac5c00ee6)
---
 elements/puppet-stack-config/puppet-stack-config.pp            | 3 ++-
 elements/puppet-stack-config/puppet-stack-config.yaml.template | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 3b62adc5e..7067c7aa6 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -139,7 +139,7 @@ class { '::keystone':
   service_name     => 'httpd',
 }
 include ::keystone::wsgi::apache
-
+include ::keystone::cron::token_flush
 include ::keystone::roles::admin
 include ::keystone::endpoint
 
@@ -209,6 +209,7 @@ class { '::nova':
 
 include ::nova::api
 include ::nova::cert
+include ::nova::cron::archive_deleted_rows
 include ::nova::compute
 include ::nova::conductor
 include ::nova::scheduler
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index ddbd1fb89..b27dd1ecf 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -151,6 +151,7 @@ keystone_ca_certificate: '{{KEYSTONE_CA_CERTIFICATE}}'
 keystone_signing_key: '{{KEYSTONE_SIGNING_KEY}}'
 keystone_signing_certificate: '{{KEYSTONE_SIGNING_CERTIFICATE}}'
 keystone::database_connection: mysql+pymysql://keystone:{{UNDERCLOUD_ADMIN_TOKEN}}@{{LOCAL_IP}}/keystone
+keystone::cron::token_flush::destination: '/dev/null'
 keystone::roles::admin::password: {{UNDERCLOUD_ADMIN_PASSWORD}}
 keystone::roles::admin::email: 'root@localhost'
 keystone::roles::admin::admin_tenant: 'admin'
@@ -308,6 +309,7 @@ nova::compute::force_config_drive: true
 nova::compute::compute_manager: 'ironic.nova.compute.manager.ClusteredComputeManager'
 nova::compute::reserved_host_memory: '0'
 nova::compute::vnc_enabled: false
+nova::cron::archive_deleted_rows::destination: '/dev/null'
 nova_sync_power_state_interval: -1
 
 nova::compute::ironic::admin_username: 'ironic'