Merge "add keystone_authtoken to conductor"
This commit is contained in:
commit
eb2d9c27da
|
@ -21,11 +21,16 @@
|
|||
# used for bay locking.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*auth_strategy*]
|
||||
# (optional) Type of authentication to be used.
|
||||
# Defaults to 'keystone'
|
||||
#
|
||||
class magnum::conductor(
|
||||
$enabled = true,
|
||||
$manage_service = true,
|
||||
$package_ensure = 'present',
|
||||
$conductor_life_check_timeout = $::os_service_default,
|
||||
$auth_strategy = 'keystone',
|
||||
) {
|
||||
|
||||
include ::magnum::db
|
||||
|
@ -59,4 +64,8 @@ class magnum::conductor(
|
|||
magnum_config {
|
||||
'conductor/conductor_life_check_timeout': value => $conductor_life_check_timeout;
|
||||
}
|
||||
|
||||
if $auth_strategy == 'keystone' {
|
||||
include ::magnum::keystone::authtoken
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ describe 'magnum::conductor' do
|
|||
|
||||
let :pre_condition do
|
||||
'include magnum'
|
||||
'class { "magnum::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
shared_examples_for 'magnum-conductor' do
|
||||
|
|
Loading…
Reference in New Issue