diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 5616f982..0f12a0ac 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -27,7 +27,7 @@ class cloud::network::controller( $api_eth = '127.0.0.1', $ks_admin_tenant = 'admin', $nova_url = 'http://127.0.0.1:8774/v2', - $nova_admin_auth_url = 'http://127.0.0.1:35357/v2.0', + $nova_admin_auth_url = 'http://127.0.0.1:5000/v2.0', $nova_admin_username = 'nova', $nova_admin_tenant_name = 'services', $nova_admin_password = 'novapassword', diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index be4bbeb8..91d366af 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -44,7 +44,7 @@ describe 'cloud::network::controller' do :ks_keystone_admin_host => '10.0.0.1', :ks_keystone_public_port => '5000', :nova_url => 'http://127.0.0.1:8774/v2', - :nova_admin_auth_url => 'http://127.0.0.1:35357/v2.0', + :nova_admin_auth_url => 'http://127.0.0.1:5000/v2.0', :nova_admin_username => 'nova', :nova_admin_tenant_name => 'services', :nova_admin_password => 'novapassword', @@ -102,7 +102,7 @@ describe 'cloud::network::controller' do it 'configure neutron server notifications to nova' do should contain_class('neutron::server::notifications').with( :nova_url => 'http://127.0.0.1:8774/v2', - :nova_admin_auth_url => 'http://127.0.0.1:35357/v2.0', + :nova_admin_auth_url => 'http://127.0.0.1:5000/v2.0', :nova_admin_username => 'nova', :nova_admin_tenant_name => 'services', :nova_admin_password => 'novapassword',