From: Matthew J. Black <mjblack@gmail.com>
Date: Wed, 11 Jan 2017 22:18:55 +0000 (-0500)
Subject: Allow python-memcache install from authtoken class
X-Git-Tag: 9.5.0~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=eb27d7e601d682fe24b0092865abff555d2eb597;p=puppet-modules%2Fpuppet-ceilometer.git

Allow python-memcache install from authtoken class

The python-memcache package is required if using memcached. By
default the package is not installed and the define has it set to
false. This change allows managing the python-memcache package
install from the authtoken class.

Change-Id: If8fea78f01e1bf54689f9ac9cb69ae4ca6be19dc
(cherry picked from commit 3bda006e6e40a3581f4f0893600066312ab027e3)
---

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index e3a1b3d..7f86161 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -164,6 +164,10 @@
 #   caching. If left undefined, tokens will instead be cached in-process.
 #   Defaults to $::os_service_default.
 #
+# [*manage_memcache_package*]
+#  (Optional) Whether to install the python-memcache package.
+#  Defaults to false.
+#
 # [*region_name*]
 #   (Optional) The region in which the identity server can be found.
 #   Defaults to $::os_service_default.
@@ -217,6 +221,7 @@ class ceilometer::keystone::authtoken(
   $memcache_security_strategy     = $::os_service_default,
   $memcache_use_advanced_pool     = $::os_service_default,
   $memcached_servers              = $::os_service_default,
+  $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $revocation_cache_time          = $::os_service_default,
   $signing_dir                    = $::os_service_default,
@@ -266,6 +271,7 @@ class ceilometer::keystone::authtoken(
     memcache_use_advanced_pool     => $memcache_use_advanced_pool,
     memcache_pool_unused_timeout   => $memcache_pool_unused_timeout,
     memcached_servers              => $memcached_servers_real,
+    manage_memcache_package        => $manage_memcache_package,
     region_name                    => $region_name,
     revocation_cache_time          => $revocation_cache_time,
     signing_dir                    => $signing_dir,
diff --git a/releasenotes/notes/authtoken_manage_memcache_package-56ab9dcc6745492c.yaml b/releasenotes/notes/authtoken_manage_memcache_package-56ab9dcc6745492c.yaml
new file mode 100644
index 0000000..09c6d5a
--- /dev/null
+++ b/releasenotes/notes/authtoken_manage_memcache_package-56ab9dcc6745492c.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Passes parameter to keystone authtoken define to manage python-memcache package install.
diff --git a/spec/classes/ceilometer_keystone_authtoken_spec.rb b/spec/classes/ceilometer_keystone_authtoken_spec.rb
index 17c1f6d..79fab8f 100644
--- a/spec/classes/ceilometer_keystone_authtoken_spec.rb
+++ b/spec/classes/ceilometer_keystone_authtoken_spec.rb
@@ -83,6 +83,7 @@ describe 'ceilometer::keystone::authtoken' do
           :memcache_security_strategy           => 'ENCRYPT',
           :memcache_use_advanced_pool           => true,
           :memcached_servers                    => ['memcached01:11211','memcached02:11211'],
+          :manage_memcache_package              => true,
           :region_name                          => 'region2',
           :revocation_cache_time                => '11',
           :signing_dir                          => '/var/cache',
@@ -127,6 +128,10 @@ describe 'ceilometer::keystone::authtoken' do
         is_expected.to contain_ceilometer_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir])
         is_expected.to contain_ceilometer_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
       end
+
+      it 'installs python memcache package' do
+        is_expected.to contain_package('python-memcache')
+      end
     end
   end