Merge "Adding a purge_config option for keystone_config"
This commit is contained in:
commit
e16782d699
@ -533,6 +533,11 @@
|
||||
# prevent keystone eventlet from auto-starting on package install.
|
||||
# Defaults to false
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the keystone config.
|
||||
# Defaults to false.
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*service_provider*]
|
||||
@ -672,6 +677,7 @@ class keystone(
|
||||
$keystone_user = $::keystone::params::keystone_user,
|
||||
$keystone_group = $::keystone::params::keystone_group,
|
||||
$manage_policyrcd = false,
|
||||
$purge_config = false,
|
||||
# DEPRECATED PARAMETERS
|
||||
$admin_workers = max($::processorcount, 2),
|
||||
$public_workers = max($::processorcount, 2),
|
||||
@ -718,6 +724,10 @@ class keystone(
|
||||
}
|
||||
}
|
||||
|
||||
resources { 'keystone_config':
|
||||
purge => $purge_config,
|
||||
}
|
||||
|
||||
keystone_config {
|
||||
'DEFAULT/admin_token': value => $admin_token, secret => true;
|
||||
'DEFAULT/public_bind_host': value => $public_bind_host;
|
||||
|
@ -65,7 +65,8 @@ describe 'keystone' do
|
||||
'public_workers' => 20,
|
||||
'paste_config' => '<SERVICE DEFAULT>',
|
||||
'sync_db' => true,
|
||||
}
|
||||
'purge_config' => false,
|
||||
}
|
||||
|
||||
override_params = {
|
||||
'package_ensure' => 'latest',
|
||||
@ -149,6 +150,12 @@ describe 'keystone' do
|
||||
end
|
||||
end
|
||||
|
||||
it 'passes purge to resource' do
|
||||
is_expected.to contain_resources('keystone_config').with({
|
||||
:purge => false
|
||||
})
|
||||
end
|
||||
|
||||
it 'should contain correct config' do
|
||||
[
|
||||
'public_bind_host',
|
||||
|
Loading…
x
Reference in New Issue
Block a user