stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Added force_config_drive param for compute"

Browse Source
This commit is contained in:
Jenkins
2013-08-13 02:09:30 +00:00
committed by Gerrit Code Review
parent 2044490ef6 f1b5d684bd
commit 6df8d5980c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute.pp
View File

@@ -96,6 +96,7 @@ class openstack::compute (
# General # General
$migration_support = false, $migration_support = false,
$verbose = false, $verbose = false,
$force_config_drive = false,
$enabled = true $enabled = true
) { ) {
@@ -144,6 +145,7 @@ class openstack::compute (
vnc_enabled => $vnc_enabled, vnc_enabled => $vnc_enabled,
vncserver_proxyclient_address => $internal_address, vncserver_proxyclient_address => $internal_address,
vncproxy_host => $vncproxy_host, vncproxy_host => $vncproxy_host,
force_config_drive => $force_config_drive,
} }
# Configure libvirt for nova-compute # Configure libvirt for nova-compute

7
spec/classes/openstack_compute_spec.rb
View File

@@ -46,7 +46,8 @@ describe 'openstack::compute' do
:enabled => true, :enabled => true,
:vnc_enabled => true, :vnc_enabled => true,
:vncserver_proxyclient_address => '127.0.0.2', :vncserver_proxyclient_address => '127.0.0.2',
:vncproxy_host => false :vncproxy_host => false,
:force_config_drive => false
) )
should contain_class('nova::compute::libvirt').with( should contain_class('nova::compute::libvirt').with(
:libvirt_type => 'kvm', :libvirt_type => 'kvm',
@@ -103,6 +104,7 @@ describe 'openstack::compute' do
:libvirt_type => 'qemu', :libvirt_type => 'qemu',
:vncproxy_host => '127.0.0.2', :vncproxy_host => '127.0.0.2',
:vnc_enabled => false, :vnc_enabled => false,
:force_config_drive => true,
:verbose => true :verbose => true
) )
end end
@@ -122,7 +124,8 @@ describe 'openstack::compute' do
:enabled => true, :enabled => true,
:vnc_enabled => false, :vnc_enabled => false,
:vncserver_proxyclient_address => '127.0.0.1', :vncserver_proxyclient_address => '127.0.0.1',
:vncproxy_host => '127.0.0.2' :vncproxy_host => '127.0.0.2',
:force_config_drive => true
) )
should contain_class('nova::compute::libvirt').with( should contain_class('nova::compute::libvirt').with(
:libvirt_type => 'qemu', :libvirt_type => 'qemu',