stackforge/puppet-openstack
Code Issues Proposed changes

fix nova::network::quantum parameters

Browse Source 
this patch updates the parameters that are passed to
the nova::network::quantum class for both the compute
and nova controller.

The most significant change is that references to quantum_connection_host
are removed b/c this parameter has not been available in nova since essex.

Other changes, remove commented out parameters, as well as updated unit tests.

Change-Id: I875c66fe881a31caa50dc10c6df72c4a74acdacc
This commit is contained in:
Dan Bode
2013-04-23 00:58:55 -07:00
parent 11729fc4bc
commit 9fdcd8b054
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute.pp
View File

@@ -182,15 +182,11 @@ class openstack::compute (
# does this have to be installed on the compute node? # does this have to be installed on the compute node?
# NOTE # NOTE
class { 'nova::network::quantum': class { 'nova::network::quantum':
#$fixed_range,
quantum_admin_password => $quantum_user_password, quantum_admin_password => $quantum_user_password,
#$use_dhcp = 'True', quantum_auth_strategy => 'keystone',
#$public_interface = undef,
quantum_connection_host => $quantum_host,
#quantum_auth_strategy => 'keystone',
quantum_url => "http://${keystone_host}:9696", quantum_url => "http://${keystone_host}:9696",
quantum_admin_tenant_name => 'services', quantum_admin_tenant_name => 'services',
#quantum_admin_username => 'quantum', quantum_admin_username => 'quantum',
quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0" quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0"
} }

6
manifests/nova/controller.pp
View File

@@ -179,15 +179,11 @@ class openstack::nova::controller (
} }
class { 'nova::network::quantum': class { 'nova::network::quantum':
#$fixed_range,
quantum_admin_password => $quantum_user_password, quantum_admin_password => $quantum_user_password,
#$use_dhcp = 'True',
#$public_interface = undef,
quantum_connection_host => 'localhost',
quantum_auth_strategy => 'keystone', quantum_auth_strategy => 'keystone',
quantum_url => "http://${keystone_host}:9696", quantum_url => "http://${keystone_host}:9696",
quantum_admin_tenant_name => 'services', quantum_admin_tenant_name => 'services',
#quantum_admin_username => 'quantum', quantum_admin_username => 'quantum',
quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0", quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0",
} }
} }

3
spec/classes/openstack_compute_spec.rb
View File

@@ -254,9 +254,10 @@ describe 'openstack::compute' do
should contain_class('nova::compute::quantum') should contain_class('nova::compute::quantum')
should contain_class('nova::network::quantum').with( should contain_class('nova::network::quantum').with(
:quantum_admin_password => 'quantum_user_password', :quantum_admin_password => 'quantum_user_password',
:quantum_connection_host => '127.0.0.1', :quantum_auth_strategy => 'keystone',
:quantum_url => "http://127.0.0.1:9696", :quantum_url => "http://127.0.0.1:9696",
:quantum_admin_tenant_name => 'services', :quantum_admin_tenant_name => 'services',
:quantum_admin_username => 'quantum',
:quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0" :quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0"
) )
end end

2
spec/classes/openstack_controller_spec.rb
View File

@@ -510,10 +510,10 @@ describe 'openstack::controller' do
should contain_class('nova::network::quantum').with({ should contain_class('nova::network::quantum').with({
:quantum_admin_password => 'q_pass', :quantum_admin_password => 'q_pass',
:quantum_connection_host => 'localhost',
:quantum_auth_strategy => 'keystone', :quantum_auth_strategy => 'keystone',
:quantum_url => "http://127.0.0.1:9696", :quantum_url => "http://127.0.0.1:9696",
:quantum_admin_tenant_name => 'services', :quantum_admin_tenant_name => 'services',
:quantum_admin_username => 'quantum',
:quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0", :quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0",
}) })