From e75d0af8f63ba2519e7c16071a0419d649a8d7ae Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 5 Jul 2016 15:36:09 +0800 Subject: [PATCH] Fix magnum default service type Magnum default service type changed from "container" to "container-infra". It is recommended to update the service type at Keystone service catalog accordingly. Change-Id: I08606ebe0b0c60a4cfc59310a010d81cf438826f --- manifests/keystone/auth.pp | 4 ++-- spec/classes/magnum_keystone_auth_spec.rb | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 49bca31..83169ee 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -28,7 +28,7 @@ # Defaults to 'true'. # # [*service_type*] -# Type of service. Defaults to 'container'. +# Type of service. Defaults to 'container-infra'. # # [*region*] # Region for endpoint. Defaults to 'RegionOne'. @@ -57,7 +57,7 @@ class magnum::keystone::auth ( $configure_user = true, $configure_user_role = true, $service_name = undef, - $service_type = 'container', + $service_type = 'container-infra', $region = 'RegionOne', $public_url = 'http://127.0.0.1:9511/v1', $admin_url = 'http://127.0.0.1:9511/v1', diff --git a/spec/classes/magnum_keystone_auth_spec.rb b/spec/classes/magnum_keystone_auth_spec.rb index 3da1333..91d6410 100644 --- a/spec/classes/magnum_keystone_auth_spec.rb +++ b/spec/classes/magnum_keystone_auth_spec.rb @@ -26,12 +26,12 @@ describe 'magnum::keystone::auth' do :roles => ['admin'] )} - it { is_expected.to contain_keystone_service('magnum::container').with( + it { is_expected.to contain_keystone_service('magnum::container-infra').with( :ensure => 'present', :description => 'magnum Container Service' ) } - it { is_expected.to contain_keystone_endpoint('RegionOne/magnum::container').with( + it { is_expected.to contain_keystone_endpoint('RegionOne/magnum::container-infra').with( :ensure => 'present', :public_url => 'http://127.0.0.1:9511/v1', :admin_url => 'http://127.0.0.1:9511/v1', @@ -47,7 +47,7 @@ describe 'magnum::keystone::auth' do :admin_url => 'http://10.10.10.12:81', } end - it { is_expected.to contain_keystone_endpoint('RegionOne/magnum::container').with( + it { is_expected.to contain_keystone_endpoint('RegionOne/magnum::container-infra').with( :ensure => 'present', :public_url => 'https://10.10.10.10:80', :internal_url => 'http://10.10.10.11:81', @@ -63,8 +63,8 @@ describe 'magnum::keystone::auth' do it { is_expected.to contain_keystone_user('magnumy') } it { is_expected.to contain_keystone_user_role('magnumy@services') } - it { is_expected.to contain_keystone_service('magnumy::container') } - it { is_expected.to contain_keystone_endpoint('RegionOne/magnumy::container') } + it { is_expected.to contain_keystone_service('magnumy::container-infra') } + it { is_expected.to contain_keystone_endpoint('RegionOne/magnumy::container-infra') } end describe 'when overriding service name' do @@ -76,8 +76,8 @@ describe 'magnum::keystone::auth' do it { is_expected.to contain_keystone_user('magnum') } it { is_expected.to contain_keystone_user_role('magnum@services') } - it { is_expected.to contain_keystone_service('magnum_service::container') } - it { is_expected.to contain_keystone_endpoint('RegionOne/magnum_service::container') } + it { is_expected.to contain_keystone_service('magnum_service::container-infra') } + it { is_expected.to contain_keystone_endpoint('RegionOne/magnum_service::container-infra') } end describe 'when disabling user configuration' do @@ -91,9 +91,9 @@ describe 'magnum::keystone::auth' do it { is_expected.not_to contain_keystone_user('magnum') } it { is_expected.to contain_keystone_user_role('magnum@services') } - it { is_expected.to contain_keystone_service('magnum::container').with( + it { is_expected.to contain_keystone_service('magnum::container-infra').with( :ensure => 'present', - :type => 'container', + :type => 'container-infra', :description => 'magnum Container Service' ) } @@ -111,9 +111,9 @@ describe 'magnum::keystone::auth' do it { is_expected.not_to contain_keystone_user('magnum') } it { is_expected.not_to contain_keystone_user_role('magnum@services') } - it { is_expected.to contain_keystone_service('magnum::container').with( + it { is_expected.to contain_keystone_service('magnum::container-infra').with( :ensure => 'present', - :type => 'container', + :type => 'container-infra', :description => 'magnum Container Service' ) }