Set [cinder] auth_type by default
The auth_type parameter is required, and defining the popular default helps users to reduce their own definitions. Change-Id: Iee47720757b091317d72938d37909427462dce6d
This commit is contained in:
parent
c5cf15fd74
commit
8dd3616d89
@ -10,8 +10,8 @@
|
|||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# [*auth_type*]
|
# [*auth_type*]
|
||||||
# Name of the auth type to load (string value)
|
# (optional) Name of the auth type to load (string value)
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'password'
|
||||||
#
|
#
|
||||||
# [*auth_url*]
|
# [*auth_url*]
|
||||||
# (optional) Points to the OpenStack Identity server IP and port.
|
# (optional) Points to the OpenStack Identity server IP and port.
|
||||||
@ -69,7 +69,7 @@
|
|||||||
#
|
#
|
||||||
class nova::cinder (
|
class nova::cinder (
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$auth_type = $::os_service_default,
|
$auth_type = 'password',
|
||||||
$auth_url = $::os_service_default,
|
$auth_url = $::os_service_default,
|
||||||
$timeout = $::os_service_default,
|
$timeout = $::os_service_default,
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
|
@ -7,7 +7,7 @@ describe 'nova::cinder' do
|
|||||||
|
|
||||||
it 'configures cinder in nova.conf' do
|
it 'configures cinder in nova.conf' do
|
||||||
should contain_nova_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
should contain_nova_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
||||||
should contain_nova_config('cinder/auth_type').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/auth_type').with_value('password')
|
||||||
should contain_nova_config('cinder/auth_url').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/auth_url').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_nova_config('cinder/timeout').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/timeout').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_nova_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
|
||||||
|
Loading…
Reference in New Issue
Block a user