From 21a466b5ca60546587f44115c1b509e794c4ba2d Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@mirantis.com>
Date: Thu, 30 Jun 2016 11:42:45 -0600
Subject: [PATCH] Add memcached_servers for keystone authtoken

This change adds the abiltity to manage the memcached servers for the
keystone authtoken configuration in heat

Change-Id: Ifa1f98607b4c0298a2723765870ef466dbb8447a
---
 manifests/init.pp                                          | 7 +++++++
 .../keystone-authtoken-memcached-5479c664f92e0179.yaml     | 4 ++++
 spec/classes/heat_init_spec.rb                             | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/keystone-authtoken-memcached-5479c664f92e0179.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 1ab72d51..421e6ad7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -243,6 +243,11 @@
 #
 # [*keystone_ec2_uri*]
 #
+# [*memcached_servers*]
+#   (optinal) a list of memcached server(s) to use for caching. If left
+#   undefined, tokens will instead be cached in-process.
+#   Defaults to $::os_service_default.
+#
 # [*database_connection*]
 #   (optional) Connection url for the heat database.
 #   Defaults to undef.
@@ -341,6 +346,7 @@ class heat(
   $keystone_project_domain_name       = 'Default',
   $keystone_user_domain_id            = 'Default',
   $keystone_user_domain_name          = 'Default',
+  $memcached_servers                  = $::os_service_default,
   $default_transport_url              = $::os_service_default,
   $rpc_backend                        = $::os_service_default,
   $rpc_response_timeout               = $::os_service_default,
@@ -523,6 +529,7 @@ class heat(
     'DEFAULT/enable_stack_adopt':           value => $enable_stack_adopt;
     'ec2authtoken/auth_uri':                value => $keystone_ec2_uri;
     'paste_deploy/flavor':                  value => $flavor;
+    'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ',');
   }
 
   oslo::messaging::notifications { 'heat_config':
diff --git a/releasenotes/notes/keystone-authtoken-memcached-5479c664f92e0179.yaml b/releasenotes/notes/keystone-authtoken-memcached-5479c664f92e0179.yaml
new file mode 100644
index 00000000..984056ae
--- /dev/null
+++ b/releasenotes/notes/keystone-authtoken-memcached-5479c664f92e0179.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Added the ability to manage the memcached servers
+    for keystone_authtoken in heat
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index 9226f1c9..064f5a6f 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -145,6 +145,10 @@ describe 'heat' do
       is_expected.to contain_heat_config('clients_heat/url').with_value('<SERVICE DEFAULT>')
     end
 
+    it 'configures keystone_authtoken memcached' do
+      is_expected.to contain_heat_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
+    end
+
     it_configures "with default auth method"
   end