stackforge/puppet-openstack
Code Issues Proposed changes

add nova-conductor

Browse Source 
Adds the nova conductor service to the nova
controller. This service is now a requirement for
grizzly.

this commit is known to break folsom compatibility.

Change-Id: I2b527e74210d8f10689e141198b7a8ed04b111c2
This commit is contained in:
Dan Bode
2013-05-15 22:30:12 -07:00
committed by Gerrit Code Review
parent 7bdab85f35
commit cbcf0564d0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/nova/controller.pp
View File

@@ -87,7 +87,7 @@ class openstack::nova::controller (
} else { } else {
$vncproxy_host_real = $public_address $vncproxy_host_real = $public_address
} }
$sql_connection = $nova_db $sql_connection = $nova_db
$glance_connection = $real_glance_api_servers $glance_connection = $real_glance_api_servers
$rabbit_connection = $internal_address $rabbit_connection = $internal_address
@@ -209,7 +209,8 @@ class openstack::nova::controller (
'nova::scheduler', 'nova::scheduler',
'nova::objectstore', 'nova::objectstore',
'nova::cert', 'nova::cert',
'nova::consoleauth' 'nova::consoleauth',
'nova::conductor'
]: ]:
enabled => $enabled, enabled => $enabled,
} }

1
spec/classes/openstack_controller_spec.rb
View File

@@ -366,6 +366,7 @@ describe 'openstack::controller' do
should contain_class('nova::consoleauth').with(:enabled => true) should contain_class('nova::consoleauth').with(:enabled => true)
should contain_class('nova::scheduler').with(:enabled => true) should contain_class('nova::scheduler').with(:enabled => true)
should contain_class('nova::objectstore').with(:enabled => true) should contain_class('nova::objectstore').with(:enabled => true)
should contain_class('nova::conductor').with(:enabled => true)
should contain_class('nova::vncproxy').with( should contain_class('nova::vncproxy').with(
:enabled => true, :enabled => true,
:host => '10.0.0.1' :host => '10.0.0.1'