openstack/puppet-glance
Code Issues Proposed changes

Merge "Fix catalog compilation when not configuring endpoint"

Browse Source
This commit is contained in:
Jenkins 2015-03-19 23:29:32 +00:00 committed by Gerrit Code Review
commit 0eed538b35
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/keystone/auth.pp
View File

@ -83,7 +83,9 @@ class glance::keystone::auth(
$real_service_name = $service_name
}
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'glance-api' |>
if $configure_endpoint {
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'glance-api' |>
}
keystone::resource::service_identity { $auth_name:
configure_user => $configure_user,

2
spec/classes/glance_keystone_auth_spec.rb
View File

@ -95,7 +95,7 @@ describe 'glance::keystone::auth' do
}
end
it { is_expected.to_not contain_keystone_endpoint('glance') }
it { is_expected.to_not contain_keystone_endpoint('RegionOne/glance') }
end
describe 'when disabling user configuration' do