openstack
/
puppet-barbican
Code Issues Proposed changes

Make Keystone_endpoint match service by name/type 

Since a chance in puppet-keystone (1], we now match an endpoint with a
service name/type.
)
[1] http://git.openstack.org/cgit/openstack/puppet-keystone/commit/?id=0a4e06abb0f5b3f324464ff5219d2885816311ce

Change-Id: I237f92ce3a656fbcc14117405a351ba219f2bba1
Closes-Bug: #1528308
Depends-On: I6e411d8f81c7ae5c768d85a236c0942d265c74dd
This commit is contained in:
Emilien Macchi 2015-12-21 19:10:15 +01:00
parent e2e560642a
commit 6088448ac8
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/keystone/auth.pp
View File

@ -70,7 +70,7 @@ class barbican::keystone::auth (
if $configure_user_role { if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'barbican-server' |> Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'barbican-server' |>
} }
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'barbican-server' |> Keystone_endpoint["${region}/${real_service_name}::${service_name}"] ~> Service <| name == 'barbican-server' |>
keystone::resource::service_identity { 'barbican': keystone::resource::service_identity { 'barbican':
configure_user => $configure_user, configure_user => $configure_user,

21
spec/classes/barbican_keystone_auth_spec.rb
View File

@ -26,13 +26,12 @@ describe 'barbican::keystone::auth' do
:roles => ['admin'] :roles => ['admin']
)} )}
it { is_expected.to contain_keystone_service('barbican').with( it { is_expected.to contain_keystone_service('barbican::key-manager').with(
:ensure => 'present', :ensure => 'present',
:type => 'key-manager',
:description => 'Key management Service' :description => 'Key management Service'
) } ) }
it { is_expected.to contain_keystone_endpoint('RegionOne/barbican').with( it { is_expected.to contain_keystone_endpoint('RegionOne/barbican::key-manager').with(
:ensure => 'present', :ensure => 'present',
:public_url => 'http://127.0.0.1:9311', :public_url => 'http://127.0.0.1:9311',
:admin_url => 'http://127.0.0.1:9311', :admin_url => 'http://127.0.0.1:9311',
@ -48,7 +47,7 @@ describe 'barbican::keystone::auth' do
:admin_url => 'http://10.10.10.12:81' } :admin_url => 'http://10.10.10.12:81' }
end end
it { is_expected.to contain_keystone_endpoint('RegionOne/barbican').with( it { is_expected.to contain_keystone_endpoint('RegionOne/barbican::key-manager').with(
:ensure => 'present', :ensure => 'present',
:public_url => 'https://10.10.10.10:80', :public_url => 'https://10.10.10.10:80',
:internal_url => 'http://10.10.10.11:81', :internal_url => 'http://10.10.10.11:81',
@ -64,8 +63,8 @@ describe 'barbican::keystone::auth' do
it { is_expected.to contain_keystone_user('barbicany') } it { is_expected.to contain_keystone_user('barbicany') }
it { is_expected.to contain_keystone_user_role('barbicany@services') } it { is_expected.to contain_keystone_user_role('barbicany@services') }
it { is_expected.to contain_keystone_service('barbicany') } it { is_expected.to contain_keystone_service('barbicany::key-manager') }
it { is_expected.to contain_keystone_endpoint('RegionOne/barbicany') } it { is_expected.to contain_keystone_endpoint('RegionOne/barbicany::key-manager') }
end end
describe 'when overriding service name' do describe 'when overriding service name' do
@ -77,8 +76,8 @@ describe 'barbican::keystone::auth' do
it { is_expected.to contain_keystone_user('barbican') } it { is_expected.to contain_keystone_user('barbican') }
it { is_expected.to contain_keystone_user_role('barbican@services') } it { is_expected.to contain_keystone_user_role('barbican@services') }
it { is_expected.to contain_keystone_service('barbican_service') } it { is_expected.to contain_keystone_service('barbican_service::key-manager') }
it { is_expected.to contain_keystone_endpoint('RegionOne/barbican_service') } it { is_expected.to contain_keystone_endpoint('RegionOne/barbican_service::key-manager') }
end end
describe 'when disabling user configuration' do describe 'when disabling user configuration' do
@ -92,9 +91,8 @@ describe 'barbican::keystone::auth' do
it { is_expected.not_to contain_keystone_user('barbican') } it { is_expected.not_to contain_keystone_user('barbican') }
it { is_expected.to contain_keystone_user_role('barbican@services') } it { is_expected.to contain_keystone_user_role('barbican@services') }
it { is_expected.to contain_keystone_service('barbican').with( it { is_expected.to contain_keystone_service('barbican::key-manager').with(
:ensure => 'present', :ensure => 'present',
:type => 'key-manager',
:description => 'Key management Service' :description => 'Key management Service'
) } ) }
@ -112,9 +110,8 @@ describe 'barbican::keystone::auth' do
it { is_expected.not_to contain_keystone_user('barbican') } it { is_expected.not_to contain_keystone_user('barbican') }
it { is_expected.not_to contain_keystone_user_role('barbican@services') } it { is_expected.not_to contain_keystone_user_role('barbican@services') }
it { is_expected.to contain_keystone_service('barbican').with( it { is_expected.to contain_keystone_service('barbican::key-manager').with(
:ensure => 'present', :ensure => 'present',
:type => 'key-manager',
:description => 'Key management Service' :description => 'Key management Service'
) } ) }