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
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

View File

@@ -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

View File

@@ -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",
})