openstack/puppet-trove
Code Issues Proposed changes

Merge "Fix catalog compilation when not configuring endpoint"

Browse Source
This commit is contained in:
Jenkins
2015-07-28 13:04:02 +00:00
committed by Gerrit Code Review
parent b3be8c5f78 39867dcd31
commit 4ce651ef07
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/keystone/auth.pp
View File

@@ -200,8 +200,10 @@ class trove::keystone::auth (
$real_service_name = pick($service_name, $auth_name)
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'trove-server' |>
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'trove-server' |>
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'trove-server' |>
Keystone_endpoint<| title == "${region}/${real_service_name}" |>
~> Service <| name == 'trove-server' |>
keystone::resource::service_identity { 'trove':
configure_user => true,

8
spec/classes/trove_keystone_auth_spec.rb
View File

@@ -130,4 +130,12 @@ describe 'trove::keystone::auth' do
it { is_expected.to contain_keystone_endpoint('RegionOne/trove_service') }
end
describe 'when disabling endpoint configuration' do
let :params do
{ :configure_endpoint => false,
:password => 'trove_password' }
end
it { is_expected.to_not contain_keystone_endpoint('RegionOne/neutron') }
end
end