stackforge/puppet-openstack
Code Issues Proposed changes

update nova_config to add sections to nova_config

Browse Source 
a patch against nova will depricate the ability to specify
nova_config settings without a section.

This patch updates openstack to work with that change in nova.

Change-Id: Ie7a9103b013dd7facefbfc6bf180f84df712a810
This commit is contained in:
Dan Bode
2013-04-12 15:54:25 -07:00
parent b766f95a92
commit 44815eff1b
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/all.pp
View File

@@ -284,8 +284,8 @@ class openstack::all (
class { 'nova::compute::quantum': } class { 'nova::compute::quantum': }
nova_config { nova_config {
'linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
'linuxnet_ovs_integration_bridge': value => 'br-int'; 'DEFAULT/linuxnet_ovs_integration_bridge': value => 'br-int';
} }
class { 'quantum::plugins::ovs': class { 'quantum::plugins::ovs':
@@ -315,7 +315,7 @@ class openstack::all (
} }
if $auto_assign_floating_ip { if $auto_assign_floating_ip {
nova_config { 'auto_assign_floating_ip': value => 'True' } nova_config { 'DEFUALT/auto_assign_floating_ip': value => 'True' }
} }
class { [ class { [

16
manifests/compute.pp
View File

@@ -118,8 +118,8 @@ class openstack::compute (
if $multi_host { if $multi_host {
include keystone::python include keystone::python
nova_config { nova_config {
'multi_host': value => 'True'; 'DEFAULT/multi_host': value => 'True';
'send_arp_for_ha': value => 'True'; 'DEFAULT/send_arp_for_ha': value => 'True';
} }
if ! $public_interface { if ! $public_interface {
fail('public_interface must be defined for multi host compute nodes') fail('public_interface must be defined for multi host compute nodes')
@@ -135,8 +135,8 @@ class openstack::compute (
} else { } else {
$enable_network_service = false $enable_network_service = false
nova_config { nova_config {
'multi_host': value => 'False'; 'DEFAULT/multi_host': value => 'False';
'send_arp_for_ha': value => 'False'; 'DEFAULT/send_arp_for_ha': value => 'False';
} }
} }
@@ -195,8 +195,8 @@ class openstack::compute (
} }
nova_config { nova_config {
'linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
'linuxnet_ovs_integration_bridge': value => 'br-int'; 'DEFAULT/linuxnet_ovs_integration_bridge': value => 'br-int';
} }
} }
@@ -214,8 +214,8 @@ class openstack::compute (
} }
# set in nova::api # set in nova::api
if ! defined(Nova_config['volume_api_class']) { if ! defined(Nova_config['DEFAULT/volume_api_class']) {
nova_config { 'volume_api_class': value => 'nova.volume.cinder.API' } nova_config { 'DEFAULT/volume_api_class': value => 'nova.volume.cinder.API' }
} }
} else { } else {
# Set up nova-volume # Set up nova-volume

4
manifests/nova/controller.pp
View File

@@ -120,7 +120,7 @@ class openstack::nova::controller (
if $quantum == false { if $quantum == false {
# Configure nova-network # Configure nova-network
if $multi_host { if $multi_host {
nova_config { 'multi_host': value => 'True' } nova_config { 'DEFAULT/multi_host': value => 'True' }
$enable_network_service = false $enable_network_service = false
} else { } else {
if $enabled { if $enabled {
@@ -193,7 +193,7 @@ class openstack::nova::controller (
} }
if $auto_assign_floating_ip { if $auto_assign_floating_ip {
nova_config { 'auto_assign_floating_ip': value => 'True' } nova_config { 'DEFAULT/auto_assign_floating_ip': value => 'True' }
} }
# a bunch of nova services that require no configuration # a bunch of nova services that require no configuration

16
spec/classes/openstack_compute_spec.rb
View File

@@ -49,8 +49,8 @@ describe 'openstack::compute' do
:libvirt_type => 'kvm', :libvirt_type => 'kvm',
:vncserver_listen => '0.0.0.0' :vncserver_listen => '0.0.0.0'
) )
should contain_nova_config('multi_host').with( :value => 'False' ) should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' )
should contain_nova_config('send_arp_for_ha').with( :value => 'False' ) should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' )
should_not contain_class('nova::api') should_not contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
:enabled => false, :enabled => false,
@@ -111,8 +111,8 @@ describe 'openstack::compute' do
:libvirt_type => 'qemu', :libvirt_type => 'qemu',
:vncserver_listen => '127.0.0.1' :vncserver_listen => '127.0.0.1'
) )
should contain_nova_config('multi_host').with( :value => 'False' ) should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' )
should contain_nova_config('send_arp_for_ha').with( :value => 'False' ) should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' )
should_not contain_class('nova::api') should_not contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
:enabled => false, :enabled => false,
@@ -134,7 +134,7 @@ describe 'openstack::compute' do
end end
it do it do
should contain_nova_config('multi_host').with({ 'value' => 'False'}) should contain_nova_config('DEFAULT/multi_host').with({ 'value' => 'False'})
should_not contain_class('nova::api') should_not contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
'enabled' => false, 'enabled' => false,
@@ -155,8 +155,8 @@ describe 'openstack::compute' do
it 'should configure nova for multi-host' do it 'should configure nova for multi-host' do
#should contain_class('keystone::python') #should contain_class('keystone::python')
should contain_nova_config('multi_host').with(:value => 'True') should contain_nova_config('DEFAULT/multi_host').with(:value => 'True')
should contain_nova_config('send_arp_for_ha').with( :value => 'True') should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'True')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
'enabled' => true, 'enabled' => true,
'install_service' => true 'install_service' => true
@@ -220,7 +220,7 @@ describe 'openstack::compute' do
end end
it { it {
should contain_nova_config('multi_host').with({ 'value' => 'True'}) should contain_nova_config('DEFAULT/multi_host').with({ 'value' => 'True'})
should contain_class('nova::api') should contain_class('nova::api')
should contain_class('nova::network').with({ should contain_class('nova::network').with({
'enabled' => true, 'enabled' => true,

6
spec/classes/openstack_controller_spec.rb
View File

@@ -359,13 +359,13 @@ describe 'openstack::controller' do
should contain_class('nova::objectstore').with(:enabled => true) should contain_class('nova::objectstore').with(:enabled => true)
should contain_class('nova::vncproxy').with(:enabled => true) should contain_class('nova::vncproxy').with(:enabled => true)
end end
it { should_not contain_nova_config('auto_assign_floating_ip') } it { should_not contain_nova_config('DEFAULT/auto_assign_floating_ip') }
end end
context 'when auto assign floating ip is assigned' do context 'when auto assign floating ip is assigned' do
let :params do let :params do
default_params.merge(:auto_assign_floating_ip => 'true') default_params.merge(:auto_assign_floating_ip => 'true')
end end
it { should contain_nova_config('auto_assign_floating_ip').with(:value => 'True')} it { should contain_nova_config('DEFAULT/auto_assign_floating_ip').with(:value => 'True')}
end end
context 'when not enabled' do context 'when not enabled' do
let :params do let :params do
@@ -546,7 +546,7 @@ describe 'openstack::controller' do
let :params do let :params do
default_params.merge(:quantum => false, :multi_host => true) default_params.merge(:quantum => false, :multi_host => true)
end end
it { should contain_nova_config('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 => false,