From 9fdcd8b054d9be65fe31ba1ba48ebe99d9514a50 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 23 Apr 2013 00:58:55 -0700 Subject: [PATCH] fix nova::network::quantum parameters 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 --- manifests/compute.pp | 8 ++------ manifests/nova/controller.pp | 6 +----- spec/classes/openstack_compute_spec.rb | 3 ++- spec/classes/openstack_controller_spec.rb | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 39324ad..f1d92a8 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -182,15 +182,11 @@ class openstack::compute ( # does this have to be installed on the compute node? # NOTE class { 'nova::network::quantum': - #$fixed_range, quantum_admin_password => $quantum_user_password, - #$use_dhcp = 'True', - #$public_interface = undef, - quantum_connection_host => $quantum_host, - #quantum_auth_strategy => 'keystone', + quantum_auth_strategy => 'keystone', quantum_url => "http://${keystone_host}:9696", quantum_admin_tenant_name => 'services', - #quantum_admin_username => 'quantum', + quantum_admin_username => 'quantum', quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0" } diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp index 1a50af7..19bbd2c 100644 --- a/manifests/nova/controller.pp +++ b/manifests/nova/controller.pp @@ -179,15 +179,11 @@ class openstack::nova::controller ( } class { 'nova::network::quantum': - #$fixed_range, quantum_admin_password => $quantum_user_password, - #$use_dhcp = 'True', - #$public_interface = undef, - quantum_connection_host => 'localhost', quantum_auth_strategy => 'keystone', quantum_url => "http://${keystone_host}:9696", quantum_admin_tenant_name => 'services', - #quantum_admin_username => 'quantum', + quantum_admin_username => 'quantum', quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0", } } diff --git a/spec/classes/openstack_compute_spec.rb b/spec/classes/openstack_compute_spec.rb index 92dc138..b105ce4 100644 --- a/spec/classes/openstack_compute_spec.rb +++ b/spec/classes/openstack_compute_spec.rb @@ -254,9 +254,10 @@ describe 'openstack::compute' do should contain_class('nova::compute::quantum') should contain_class('nova::network::quantum').with( :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_admin_tenant_name => 'services', + :quantum_admin_username => 'quantum', :quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0" ) end diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb index a9dd5be..693de3e 100644 --- a/spec/classes/openstack_controller_spec.rb +++ b/spec/classes/openstack_controller_spec.rb @@ -510,10 +510,10 @@ describe 'openstack::controller' do should contain_class('nova::network::quantum').with({ :quantum_admin_password => 'q_pass', - :quantum_connection_host => 'localhost', :quantum_auth_strategy => 'keystone', :quantum_url => "http://127.0.0.1:9696", :quantum_admin_tenant_name => 'services', + :quantum_admin_username => 'quantum', :quantum_admin_auth_url => "http://127.0.0.1:35357/v2.0", })