openstack
/
puppet-ironic
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: Ie62c22c1bbfd1fbd224cc4858cdf3ffaa2e6a8ea
Closes-Bug: #1528308
This commit is contained in:
Emilien Macchi 2015-12-21 20:10:34 +01:00
parent 12e15ba21a
commit 1777e6c031
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/keystone/auth.pp
View File

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

23
spec/classes/ironic_keystone_auth_spec.rb
View File

@ -42,13 +42,12 @@ describe 'ironic::keystone::auth' do
:roles => ['admin']
)}
it { is_expected.to contain_keystone_service('ironic').with(
it { is_expected.to contain_keystone_service('ironic::baremetal').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Bare Metal Provisioning Service'
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic::baremetal').with(
:ensure => 'present',
:public_url => "http://127.0.0.1:6385",
:admin_url => "http://127.0.0.1:6385",
@ -77,7 +76,7 @@ describe 'ironic::keystone::auth' do
:internal_url => 'https://10.0.0.11:6385' }
end
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic::baremetal').with(
:ensure => 'present',
:public_url => 'https://10.0.0.10:6385',
:admin_url => 'https://10.0.0.11:6385',
@ -96,7 +95,7 @@ describe 'ironic::keystone::auth' do
:admin_address => '10.10.10.12' }
end
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic::baremetal').with(
:ensure => 'present',
:public_url => "https://10.10.10.10:80",
:internal_url => "http://10.10.10.11:81",
@ -112,8 +111,8 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_user('ironicy') }
it { is_expected.to contain_keystone_user_role('ironicy@services') }
it { is_expected.to contain_keystone_service('ironicy') }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironicy') }
it { is_expected.to contain_keystone_service('ironicy::baremetal') }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironicy::baremetal') }
end
describe 'when overriding service name' do
@ -126,8 +125,8 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_user('ironic') }
it { is_expected.to contain_keystone_user_role('ironic@services') }
it { is_expected.to contain_keystone_service('ironic_service') }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic_service') }
it { is_expected.to contain_keystone_service('ironic_service::baremetal') }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic_service::baremetal') }
end
describe 'when disabling user configuration' do
@ -143,9 +142,8 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_user_role('ironic@services') }
it { is_expected.to contain_keystone_service('ironic').with(
it { is_expected.to contain_keystone_service('ironic::baremetal').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Bare Metal Provisioning Service'
) }
@ -165,9 +163,8 @@ describe 'ironic::keystone::auth' do
it { is_expected.not_to contain_keystone_user_role('ironic@services') }
it { is_expected.to contain_keystone_service('ironic').with(
it { is_expected.to contain_keystone_service('ironic::baremetal').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Bare Metal Provisioning Service'
) }