stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Fix nova-network settings in multi_host mode"

Browse Source
This commit is contained in:
Jenkins
2013-09-05 05:21:25 +00:00
committed by Gerrit Code Review
parent 6a2095f704 62873ac9e0
commit a379a340c7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/all.pp
View File

@@ -456,7 +456,6 @@ class openstack::all (
} }
} else { } else {
nova_config { nova_config {
'DEFAULT/multi_host': value => false;
'DEFAULT/send_arp_for_ha': value => false; 'DEFAULT/send_arp_for_ha': value => false;
} }
} }

3
manifests/nova/controller.pp
View File

@@ -176,8 +176,9 @@ class openstack::nova::controller (
# Configure nova-network # Configure nova-network
if $multi_host { if $multi_host {
nova_config { 'DEFAULT/multi_host': value => true } nova_config { 'DEFAULT/multi_host': value => true }
$enable_network_service = false $enable_network_service = true
} else { } else {
nova_config { 'DEFAULT/multi_host': value => false }
if $enabled { if $enabled {
$enable_network_service = true $enable_network_service = true
} else { } else {

4
spec/classes/openstack_controller_spec.rb
View File

@@ -692,8 +692,8 @@ describe 'openstack::controller' do
it { should contain_nova_config('DEFAULT/multi_host').with(:value => true)} it { should contain_nova_config('DEFAULT/multi_host').with(:value => true)}
it {should contain_class('nova::network').with( it {should contain_class('nova::network').with(
:create_networks => true, :create_networks => true,
:enabled => false, :enabled => true,
:install_service => false :install_service => true
)} )}
end end