x
/
puppet-tuskar
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: I09c80c1c9b816a4dc734a268010fe8569ca8ec03
Closes-Bug: #1528308
This commit is contained in:
Emilien Macchi 2015-12-21 20:52:32 +01:00
parent c659683d0d
commit cb68e4142e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/keystone/auth.pp
View File

@ -192,7 +192,7 @@ class tuskar::keystone::auth (
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tuskar-api' |>
}
Keystone_endpoint["${region}/${auth_name}"] ~> Service <| name == 'tuskar-api' |>
Keystone_endpoint["${region}/${auth_name}::${service_type}"] ~> Service <| name == 'tuskar-api' |>
keystone::resource::service_identity { $auth_name:
configure_user => $configure_user,

13
spec/classes/tuskar_keystone_auth_spec.rb
View File

@ -25,13 +25,12 @@ describe 'tuskar::keystone::auth' do
:roles => ['admin']
)}
it { is_expected.to contain_keystone_service('tuskar').with(
it { is_expected.to contain_keystone_service('tuskar::management').with(
:ensure => 'present',
:type => 'management',
:description => 'Tuskar Management Service'
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
:ensure => 'present',
:public_url => "http://127.0.0.1:8585",
:admin_url => "http://127.0.0.1:8585",
@ -47,7 +46,7 @@ describe 'tuskar::keystone::auth' do
:internal_url => 'https://10.0.0.11:8585' }
end
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
:ensure => 'present',
:public_url => 'https://10.0.0.10:8585',
:admin_url => 'https://10.0.0.11:8585',
@ -77,7 +76,7 @@ describe 'tuskar::keystone::auth' do
:admin_address => '10.10.10.12' }
end
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskar::management').with(
:ensure => 'present',
:public_url => "https://10.10.10.10:80",
:internal_url => "http://10.10.10.11:81",
@ -93,8 +92,8 @@ describe 'tuskar::keystone::auth' do
it { is_expected.to contain_keystone_user('tuskary') }
it { is_expected.to contain_keystone_user_role('tuskary@services') }
it { is_expected.to contain_keystone_service('tuskary') }
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskary') }
it { is_expected.to contain_keystone_service('tuskary::management') }
it { is_expected.to contain_keystone_endpoint('RegionOne/tuskary::management') }
end
describe 'when overriding various parameters' do