Change FIXME for keystone
Changed FIXME to the freezer project purpose Change-Id: I13dfa29b65b858a27024332d8db43a0aecd58e98
This commit is contained in:
parent
61c5117ba0
commit
e3d056768a
@ -31,7 +31,7 @@
|
||||
# Defaults to 'true'.
|
||||
#
|
||||
# [*service_type*]
|
||||
# Type of service. Defaults to 'key-manager'.
|
||||
# Type of service. Defaults to 'backup'.
|
||||
#
|
||||
# [*region*]
|
||||
# Region for endpoint. Defaults to 'RegionOne'.
|
||||
@ -42,18 +42,18 @@
|
||||
#
|
||||
# [*service_description*]
|
||||
# (optional) Description of the service.
|
||||
# Default to 'freezer FIXME Service'
|
||||
# Default to 'OpenStack distributed backup restore and disaster recovery as a service platform'
|
||||
#
|
||||
# [*public_url*]
|
||||
# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:FIXME')
|
||||
# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9090')
|
||||
# This url should *not* contain any trailing '/'.
|
||||
#
|
||||
# [*admin_url*]
|
||||
# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:FIXME')
|
||||
# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:9090')
|
||||
# This url should *not* contain any trailing '/'.
|
||||
#
|
||||
# [*internal_url*]
|
||||
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:FIXME')
|
||||
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9090')
|
||||
#
|
||||
class freezer::keystone::auth (
|
||||
$password,
|
||||
@ -65,12 +65,12 @@ class freezer::keystone::auth (
|
||||
$configure_user = true,
|
||||
$configure_user_role = true,
|
||||
$service_name = 'freezer',
|
||||
$service_description = 'freezer FIXME Service',
|
||||
$service_type = 'FIXME',
|
||||
$service_description = 'OpenStack distributed backup restore and disaster recovery as a service platform',
|
||||
$service_type = 'backup',
|
||||
$region = 'RegionOne',
|
||||
$public_url = 'http://127.0.0.1:FIXME',
|
||||
$admin_url = 'http://127.0.0.1:FIXME',
|
||||
$internal_url = 'http://127.0.0.1:FIXME',
|
||||
$public_url = 'http://127.0.0.1:9090',
|
||||
$admin_url = 'http://127.0.0.1:9090',
|
||||
$internal_url = 'http://127.0.0.1:9090',
|
||||
) {
|
||||
|
||||
if $configure_user_role {
|
||||
|
@ -22,16 +22,16 @@ describe 'freezer::keystone::auth' do
|
||||
:roles => ['admin']
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_keystone_service('freezer::FIXME').with(
|
||||
it { is_expected.to contain_keystone_service('freezer::backup').with(
|
||||
:ensure => 'present',
|
||||
:description => 'freezer FIXME Service'
|
||||
:description => 'OpenStack distributed backup restore and disaster recovery as a service platform'
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::FIXME').with(
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::backup').with(
|
||||
:ensure => 'present',
|
||||
:public_url => 'http://127.0.0.1:FIXME',
|
||||
:admin_url => 'http://127.0.0.1:FIXME',
|
||||
:internal_url => 'http://127.0.0.1:FIXME',
|
||||
:public_url => 'http://127.0.0.1:9090',
|
||||
:admin_url => 'http://127.0.0.1:9090',
|
||||
:internal_url => 'http://127.0.0.1:9090',
|
||||
) }
|
||||
end
|
||||
|
||||
@ -43,7 +43,7 @@ describe 'freezer::keystone::auth' do
|
||||
:admin_url => 'http://10.10.10.12:81', }
|
||||
end
|
||||
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::FIXME').with(
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::backup').with(
|
||||
:ensure => 'present',
|
||||
:public_url => 'https://10.10.10.10:80',
|
||||
:internal_url => 'http://10.10.10.11:81',
|
||||
@ -59,8 +59,8 @@ describe 'freezer::keystone::auth' do
|
||||
|
||||
it { is_expected.to contain_keystone_user('freezery') }
|
||||
it { is_expected.to contain_keystone_user_role('freezery@services') }
|
||||
it { is_expected.to contain_keystone_service('freezer::FIXME') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::FIXME') }
|
||||
it { is_expected.to contain_keystone_service('freezer::backup') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer::backup') }
|
||||
end
|
||||
|
||||
context 'when overriding service name' do
|
||||
@ -72,8 +72,8 @@ describe 'freezer::keystone::auth' do
|
||||
|
||||
it { is_expected.to contain_keystone_user('freezer') }
|
||||
it { is_expected.to contain_keystone_user_role('freezer@services') }
|
||||
it { is_expected.to contain_keystone_service('freezer_service::FIXME') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer_service::FIXME') }
|
||||
it { is_expected.to contain_keystone_service('freezer_service::backup') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/freezer_service::backup') }
|
||||
end
|
||||
|
||||
context 'when disabling user configuration' do
|
||||
@ -87,9 +87,9 @@ describe 'freezer::keystone::auth' do
|
||||
|
||||
it { is_expected.not_to contain_keystone_user('freezer') }
|
||||
it { is_expected.to contain_keystone_user_role('freezer@services') }
|
||||
it { is_expected.to contain_keystone_service('freezer::FIXME').with(
|
||||
it { is_expected.to contain_keystone_service('freezer::backup').with(
|
||||
:ensure => 'present',
|
||||
:description => 'freezer FIXME Service'
|
||||
:description => 'OpenStack distributed backup restore and disaster recovery as a service platform'
|
||||
) }
|
||||
|
||||
end
|
||||
@ -106,9 +106,9 @@ describe 'freezer::keystone::auth' do
|
||||
|
||||
it { is_expected.not_to contain_keystone_user('freezer') }
|
||||
it { is_expected.not_to contain_keystone_user_role('freezer@services') }
|
||||
it { is_expected.to contain_keystone_service('freezer::FIXME').with(
|
||||
it { is_expected.to contain_keystone_service('freezer::backup').with(
|
||||
:ensure => 'present',
|
||||
:description => 'freezer FIXME Service'
|
||||
:description => 'OpenStack distributed backup restore and disaster recovery as a service platform'
|
||||
) }
|
||||
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user