set purging to false

setting purging to true is not a great user experience.

B/c every single default parameter set by the openstack
packages are not managed by puppet, setting purging to
true is likely to remove some default parameters which
is not an intuitive default behavior.

Change-Id: Ie8b0b0a8dbcfe68f8eb307940b587ba94ff3c7c0
This commit is contained in:
Dan Bode
2013-05-24 14:12:59 -07:00
parent 99b2c234ec
commit 990d850248
6 changed files with 18 additions and 5 deletions

View File

@@ -31,7 +31,7 @@
# [glance_user_password] The password of the glance service user. Optional. Defaults to 'glance_pass'.
# [secret_key] The secret key for horizon. Optional. Defaults to 'dummy_secret_key'.
# [verbose] If the services should log verbosely. Optional. Defaults to false.
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true.
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to false.
# [libvirt_type] The virualization type being controlled by libvirt. Optional. Defaults to 'kvm'.
# [volume_group] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'cinder-volumes'.
# [horizon] (bool) is horizon installed. Defaults to: true
@@ -96,7 +96,7 @@ class openstack::all (
# Nova
$nova_db_user = 'nova',
$nova_db_dbname = 'nova',
$purge_nova_config = true,
$purge_nova_config = false,
# Network
$network_manager = 'nova.network.manager.FlatDHCPManager',
$fixed_range = '10.0.0.0/24',

View File

@@ -3,7 +3,9 @@
#
# Manifest to install/configure nova-compute
#
# === Parameters
# [purge_nova_config]
# Whether unmanaged nova.conf entries should be purged.
# (optional) Defaults to false.
#
# === Examples
#
@@ -45,7 +47,7 @@ class openstack::compute (
# Nova
$nova_admin_tenant_name = 'services',
$nova_admin_user = 'nova',
$purge_nova_config = true,
$purge_nova_config = false,
$libvirt_vif_driver = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver',
# Rabbit
$rabbit_host = '127.0.0.1',

View File

@@ -18,6 +18,11 @@
# [glance_user_password] Glance service user password.
# [nova_db_password] Nova DB password.
# [nova_user_password] Nova service password.
#
# [purge_nova_config]
# Whether unmanaged nova.conf entries should be purged.
# (optional) Defaults to false.
#
# [rabbit_password] Rabbit password.
# [rabbit_user] Rabbit User. Optional. Defaults to openstack.
# [rabbit_virtual_host] Rabbit virtual host path for Nova. Defaults to '/'.
@@ -123,7 +128,7 @@ class openstack::controller (
$nova_admin_user = 'nova',
$nova_db_user = 'nova',
$nova_db_dbname = 'nova',
$purge_nova_config = true,
$purge_nova_config = false,
$enabled_apis = 'ec2,osapi_compute,metadata',
# Nova Networking
$public_interface = false,

View File

@@ -87,4 +87,8 @@ describe 'openstack::all' do
end
it { should contain_nova_config('DEFAULT/auto_assign_floating_ip').with(:value => 'True')}
end
context 'nova' do
it { should_not contain_resources('nova_config').with_purge(true) }
end
end

View File

@@ -39,6 +39,7 @@ describe 'openstack::compute' do
:glance_api_servers => false,
:verbose => false
)
should_not contain_resources('nova_config').with_purge(true)
should contain_class('nova::compute').with(
:enabled => true,
:vnc_enabled => true,

View File

@@ -344,6 +344,7 @@ describe 'openstack::controller' do
context 'with default params' do
it 'should contain enabled nova services' do
should_not contain_resources('nova_config').with_purge(true)
should contain_class('nova::rabbitmq').with(
:userid => 'openstack',
:password => 'rabbit_pw',