From dadb8de7a85fe3bc7ae0729631a9f3e49de11f8d Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Wed, 8 Jun 2016 09:49:39 +0300 Subject: [PATCH] Change default service_name to 'barbican' 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 --- manifests/keystone/auth.pp | 10 ++++------ spec/classes/barbican_keystone_auth_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 75e1d95e..2d730bd8 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -35,7 +35,7 @@ # # [*service_name*] # (optional) Name of the service. -# Defaults to the value of auth_name. +# Defaults to 'barbican'. # # [*public_url*] # (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_user = true, $configure_user_role = true, - $service_name = undef, + $service_name = 'barbican', $service_type = 'key-manager', $region = 'RegionOne', $public_url = 'http://127.0.0.1:9311', @@ -65,18 +65,16 @@ class barbican::keystone::auth ( $admin_url = 'http://127.0.0.1:9311', ) { - $real_service_name = pick($service_name, $auth_name) - if $configure_user_role { 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': configure_user => $configure_user, configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, - service_name => $real_service_name, + service_name => $service_name, service_type => $service_type, service_description => 'Key management Service', region => $region, diff --git a/spec/classes/barbican_keystone_auth_spec.rb b/spec/classes/barbican_keystone_auth_spec.rb index 5029b9d7..55016eb6 100644 --- a/spec/classes/barbican_keystone_auth_spec.rb +++ b/spec/classes/barbican_keystone_auth_spec.rb @@ -63,8 +63,8 @@ describe 'barbican::keystone::auth' do it { is_expected.to contain_keystone_user('barbicany') } 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_endpoint('RegionOne/barbicany::key-manager') } + it { is_expected.to contain_keystone_service('barbican::key-manager') } + it { is_expected.to contain_keystone_endpoint('RegionOne/barbican::key-manager') } end describe 'when overriding service name' do