Merge "Switch $service_name to 'glance' for keystone"
This commit is contained in:
commit
a2acbc7110
|
@ -25,7 +25,7 @@
|
||||||
#
|
#
|
||||||
# [*service_name*]
|
# [*service_name*]
|
||||||
# Name of the service. Optional.
|
# Name of the service. Optional.
|
||||||
# Defaults to 'Image Service'.
|
# Defaults to 'glance'.
|
||||||
#
|
#
|
||||||
# [*service_type*]
|
# [*service_type*]
|
||||||
# Type of service. Optional. Defaults to 'image'.
|
# Type of service. Optional. Defaults to 'image'.
|
||||||
|
@ -67,7 +67,7 @@ class glance::keystone::auth(
|
||||||
$configure_endpoint = true,
|
$configure_endpoint = true,
|
||||||
$configure_user = true,
|
$configure_user = true,
|
||||||
$configure_user_role = true,
|
$configure_user_role = true,
|
||||||
$service_name = 'Image Service',
|
$service_name = 'glance',
|
||||||
$service_type = 'image',
|
$service_type = 'image',
|
||||||
$region = 'RegionOne',
|
$region = 'RegionOne',
|
||||||
$tenant = 'services',
|
$tenant = 'services',
|
||||||
|
|
|
@ -19,12 +19,12 @@ describe 'glance::keystone::auth' do
|
||||||
:roles => ['admin']
|
:roles => ['admin']
|
||||||
) }
|
) }
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_service('Image Service::image').with(
|
it { is_expected.to contain_keystone_service('glance::image').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:description => 'OpenStack Image Service'
|
:description => 'OpenStack Image Service'
|
||||||
) }
|
) }
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_endpoint('RegionOne/Image Service::image').with(
|
it { is_expected.to contain_keystone_endpoint('RegionOne/glance::image').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:public_url => 'http://127.0.0.1:9292',
|
:public_url => 'http://127.0.0.1:9292',
|
||||||
:admin_url => 'http://127.0.0.1:9292',
|
:admin_url => 'http://127.0.0.1:9292',
|
||||||
|
@ -53,7 +53,7 @@ describe 'glance::keystone::auth' do
|
||||||
:roles => ['admin']
|
:roles => ['admin']
|
||||||
) }
|
) }
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_service('Image Service::imagey').with(
|
it { is_expected.to contain_keystone_service('glance::imagey').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:description => 'OpenStack Image Service'
|
:description => 'OpenStack Image Service'
|
||||||
) }
|
) }
|
||||||
|
@ -69,7 +69,7 @@ describe 'glance::keystone::auth' do
|
||||||
:admin_url => 'https://10.10.10.12:81/v2' }
|
:admin_url => 'https://10.10.10.12:81/v2' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_endpoint('RegionTwo/Image Service::image').with(
|
it { is_expected.to contain_keystone_endpoint('RegionTwo/glance::image').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:public_url => 'https://10.10.10.10:81/v2',
|
:public_url => 'https://10.10.10.10:81/v2',
|
||||||
:internal_url => 'https://10.10.10.11:81/v2',
|
:internal_url => 'https://10.10.10.11:81/v2',
|
||||||
|
@ -86,7 +86,7 @@ describe 'glance::keystone::auth' do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to_not contain_keystone_endpoint('RegionOne/Image Service::image') }
|
it { is_expected.to_not contain_keystone_endpoint('RegionOne/glance::image') }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when disabling user configuration' do
|
describe 'when disabling user configuration' do
|
||||||
|
@ -101,7 +101,7 @@ describe 'glance::keystone::auth' do
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_user_role('glance@services') }
|
it { is_expected.to contain_keystone_user_role('glance@services') }
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_service('Image Service::image').with(
|
it { is_expected.to contain_keystone_service('glance::image').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:description => 'OpenStack Image Service'
|
:description => 'OpenStack Image Service'
|
||||||
) }
|
) }
|
||||||
|
@ -120,7 +120,7 @@ describe 'glance::keystone::auth' do
|
||||||
|
|
||||||
it { is_expected.to_not contain_keystone_user_role('glance@services') }
|
it { is_expected.to_not contain_keystone_user_role('glance@services') }
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_service('Image Service::image').with(
|
it { is_expected.to contain_keystone_service('glance::image').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:description => 'OpenStack Image Service'
|
:description => 'OpenStack Image Service'
|
||||||
) }
|
) }
|
||||||
|
@ -138,7 +138,7 @@ describe 'glance::keystone::auth' do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_keystone_endpoint('RegionOne/Image Service::image').with_notify(["Service[glance-api]"]) }
|
it { is_expected.to contain_keystone_endpoint('RegionOne/glance::image').with_notify(["Service[glance-api]"]) }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when overriding service name' do
|
describe 'when overriding service name' do
|
||||||
|
|
Loading…
Reference in New Issue