openstack/puppet-zaqar
Code Issues Proposed changes

Add purge_config option

Browse Source 
Add the option in order to facilitate management.
User can ensure that only the options they hoped
are configured.

Change-Id: Iade2197388b1aa114f2fd9e2ab53a62f1f45c4e9
This commit is contained in:
ZhongShengping 2016-10-27 00:15:55 +08:00
parent 2c7b8d901d
commit 7436100653
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
manifests/init.pp
View File

@ -58,6 +58,11 @@
# (Optional) Ensure state for package.
# Defaults to present.
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
# in the zaqar config.
# Defaults to false.
#
# = DEPRECATED PARAMETERS
#
# [*identity_uri*]
@ -81,25 +86,29 @@
# Defaults to undef
#
class zaqar(
$auth_strategy = 'keystone',
$admin_mode = $::os_service_default,
$unreliable = $::os_service_default,
$pooling = $::os_service_default,
$queue_pipeline = $::os_service_default,
$message_pipeline = $::os_service_default,
$claim_pipeline = $::os_service_default,
$subscription_pipeline = $::os_service_default,
$max_messages_post_size = $::os_service_default,
$package_name = $::zaqar::params::package_name,
$package_ensure = 'present',
$auth_strategy = 'keystone',
$admin_mode = $::os_service_default,
$unreliable = $::os_service_default,
$pooling = $::os_service_default,
$queue_pipeline = $::os_service_default,
$message_pipeline = $::os_service_default,
$claim_pipeline = $::os_service_default,
$subscription_pipeline = $::os_service_default,
$max_messages_post_size = $::os_service_default,
$package_name = $::zaqar::params::package_name,
$package_ensure = 'present',
$purge_config = false,
# Deprecated
$identity_uri = undef,
$auth_uri = undef,
$admin_user = undef,
$admin_password = undef,
$admin_tenant_name = undef,
$identity_uri = undef,
$auth_uri = undef,
$admin_user = undef,
$admin_password = undef,
$admin_tenant_name = undef,
) inherits zaqar::params {
resources { 'zaqar_config':
purge => $purge_config,
}
if $identity_uri {
warning('zaqar::identity_uri is deprecated, use zaqar::keystone::authtoken::auth_url instead')

8
spec/classes/zaqar_init_spec.rb
View File

@ -9,7 +9,13 @@ describe 'zaqar' do
describe 'with only required params' do
let :params do
req_params
req_params.merge!(:purge_config => false)
end
it 'passes purge to resource' do
is_expected.to contain_resources('zaqar_config').with({
:purge => false
})
end
it { is_expected.to contain_package('zaqar-common').with(