diff --git a/manifests/init.pp b/manifests/init.pp index aa328f0..01aab14 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -232,6 +232,11 @@ # (Optional) Public identity endpoint # Defaults to 'http://127.0.0.1:5000' # +# [*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. +# # [*signing_dir*] # (Optional) Directory used to cache files related to PKI tokens # Defaults to '/tmp/keystone-signing-muranoapi' @@ -306,6 +311,7 @@ class murano( $admin_user = 'murano', $admin_tenant_name = 'services', $auth_uri = 'http://127.0.0.1:5000', + $memcached_servers = $::os_service_default, $signing_dir = '/tmp/keystone-signing-muranoapi', $purge_config = false, # Deprecated @@ -390,6 +396,7 @@ class murano( 'keystone_authtoken/signing_dir' : value => $signing_dir; 'keystone_authtoken/admin_password' : value => $admin_password; 'keystone_authtoken/identity_uri' : value => $identity_uri; + 'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ','); 'networking/default_dns': value => $default_nameservers; diff --git a/releasenotes/notes/keystone-authtoken-memcached-eb3dc3fa52ecc2f2.yaml b/releasenotes/notes/keystone-authtoken-memcached-eb3dc3fa52ecc2f2.yaml new file mode 100644 index 0000000..67c27ed --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-memcached-eb3dc3fa52ecc2f2.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Added the ability to manage the memcached servers + for keystone_authtoken in murano diff --git a/spec/classes/murano_init_spec.rb b/spec/classes/murano_init_spec.rb index cb90692..c440ee6 100644 --- a/spec/classes/murano_init_spec.rb +++ b/spec/classes/murano_init_spec.rb @@ -61,6 +61,7 @@ describe 'murano' do it { is_expected.to contain_murano_config('keystone_authtoken/signing_dir').with_value('/tmp/keystone-signing-muranoapi') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_password').with_value('secrete') } it { is_expected.not_to contain_murano_config('keystone_authtoken/identity_uri').with_value('http://10.255.0.1:35357/') } + it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('') } it { is_expected.to contain_murano_config('packages_opts/packages_service').with_value('') } it { is_expected.to contain_exec('murano-dbmanage') } @@ -105,6 +106,7 @@ describe 'murano' do :kombu_reconnect_delay => '1.0', :kombu_failover_strategy => 'round-robin', :kombu_compression => 'gzip', + :memcached_servers => '1.1.1.1:11211', } end @@ -148,6 +150,7 @@ describe 'murano' do it { is_expected.to contain_murano_config('keystone_authtoken/signing_dir').with_value('/tmp/keystone-muranoapi') } it { is_expected.to contain_murano_config('keystone_authtoken/identity_uri').with_value('http://10.255.0.1:35357/') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_password').with_value('secrete') } + it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('1.1.1.1:11211') } it { is_expected.to contain_murano_config('networking/external_network').with_value('murano-net') } it { is_expected.to contain_murano_config('networking/router_name').with_value('murano-router') }