openstack/puppet-barbican
Code Issues Proposed changes

Change default service_name to 'barbican'

Browse Source 
While we were already able to pick an independent auth_name and
service_name; the service_name was defaulting to auth_name. Now it
has a value of its own to be consistent with other modules.

Related-Bug: #1590040
Change-Id: Ied45e546667b7c04e9b511a3ae23c529ad78e7df
This commit is contained in:
Juan Antonio Osorio Robles
2016-06-08 09:49:39 +03:00
parent 8ed62a44d7
commit dadb8de7a8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/keystone/auth.pp
View File

@@ -35,7 +35,7 @@
# #
# [*service_name*] # [*service_name*]
# (optional) Name of the service. # (optional) Name of the service.
# Defaults to the value of auth_name. # Defaults to 'barbican'.
# #
# [*public_url*] # [*public_url*]
# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9311') # (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9311')
@@ -57,7 +57,7 @@ class barbican::keystone::auth (
$configure_endpoint = true, $configure_endpoint = true,
$configure_user = true, $configure_user = true,
$configure_user_role = true, $configure_user_role = true,
$service_name = undef, $service_name = 'barbican',
$service_type = 'key-manager', $service_type = 'key-manager',
$region = 'RegionOne', $region = 'RegionOne',
$public_url = 'http://127.0.0.1:9311', $public_url = 'http://127.0.0.1:9311',
@@ -65,18 +65,16 @@ class barbican::keystone::auth (
$admin_url = 'http://127.0.0.1:9311', $admin_url = 'http://127.0.0.1:9311',
) { ) {
$real_service_name = pick($service_name, $auth_name)
if $configure_user_role { if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'barbican-api' |> Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'barbican-api' |>
} }
Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'barbican-api' |> Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'barbican-api' |>
keystone::resource::service_identity { 'barbican': keystone::resource::service_identity { 'barbican':
configure_user => $configure_user, configure_user => $configure_user,
configure_user_role => $configure_user_role, configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
service_name => $real_service_name, service_name => $service_name,
service_type => $service_type, service_type => $service_type,
service_description => 'Key management Service', service_description => 'Key management Service',
region => $region, region => $region,

4
spec/classes/barbican_keystone_auth_spec.rb
View File

@@ -63,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::key-manager') } it { is_expected.to contain_keystone_service('barbican::key-manager') }
it { is_expected.to contain_keystone_endpoint('RegionOne/barbicany::key-manager') } it { is_expected.to contain_keystone_endpoint('RegionOne/barbican::key-manager') }
end end
describe 'when overriding service name' do describe 'when overriding service name' do