openstack
/
puppet-tripleo
Code Issues Proposed changes

Use keystone::cache 

This patch includes and starts using the
keystone::cache class explicitly.

The other parameters will be removed in [1].

[1] https://review.opendev.org/#/c/746643/

Change-Id: I6c0e8d33538edc1d521e38f028ff2772614feb99
This commit is contained in:
Tobias Urdin 2020-08-18 13:18:46 +02:00
parent 7a98cdce7d
commit e644fef49c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/base/keystone.pp
View File

@ -227,6 +227,10 @@ class tripleo::profile::base::keystone (
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
$memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
class { 'keystone::cache':
memcache_servers => $memcached_servers,
}
class { 'keystone':
sync_db => $sync_db,
default_transport_url => os_transport_url({
@ -248,7 +252,6 @@ class tripleo::profile::base::keystone (
notification_topics => union($ceilometer_notification_topics,
$barbican_notification_topics,
$extra_notification_topics),
cache_memcache_servers => $memcached_servers
}
if 'amqp' in [$oslomsg_rpc_proto, $oslomsg_notify_proto]{

12
spec/classes/tripleo_profile_base_keystone_spec.rb
View File

@ -61,10 +61,12 @@ describe 'tripleo::profile::base::keystone' do
end
it 'should trigger complete configuration' do
is_expected.to contain_class('keystone::cache').with(
:memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone').with(
:default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
:cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone::config')
is_expected.to contain_class('keystone::logging')
@ -108,10 +110,12 @@ describe 'tripleo::profile::base::keystone' do
end
it 'should trigger keystone configuration' do
is_expected.to contain_class('keystone::cache').with(
:memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone').with(
:default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
:cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone::config')
is_expected.to contain_class('keystone::logging')
@ -135,10 +139,12 @@ describe 'tripleo::profile::base::keystone' do
end
it 'should trigger keystone configuration' do
is_expected.to contain_class('keystone::cache').with(
:memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone').with(
:default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
:cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
)
is_expected.to contain_class('keystone::config')
is_expected.to contain_class('keystone::logging')