From dfb6109c88be55801a0bd2d1caf221a99091068b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 28 May 2014 14:36:29 +0200 Subject: [PATCH 1/2] neutron: change default credentials for nova notifications By default, we should use "admin" tenant to get an admin token and make the VM connectivity working in Nova. Using Nova user will fail since Nova (services tenant) can't get an admin token. --- manifests/network/controller.pp | 6 +++--- spec/classes/cloud_network_controller_spec.rb | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 5616f982..4c03334d 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -28,9 +28,9 @@ class cloud::network::controller( $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_username = 'nova', - $nova_admin_tenant_name = 'services', - $nova_admin_password = 'novapassword', + $nova_admin_username = 'admin', + $nova_admin_tenant_name = 'admin', + $nova_admin_password = 'adminpassword', $nova_region_name = 'RegionOne' ) { diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index be4bbeb8..9e208a48 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -45,9 +45,9 @@ describe 'cloud::network::controller' do :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_username => 'nova', - :nova_admin_tenant_name => 'services', - :nova_admin_password => 'novapassword', + :nova_admin_username => 'admin', + :nova_admin_tenant_name => 'admin', + :nova_admin_password => 'adminpassword', :nova_region_name => 'RegionOne', :api_eth => '10.0.0.1' } end @@ -103,9 +103,9 @@ describe 'cloud::network::controller' 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_username => 'nova', - :nova_admin_tenant_name => 'services', - :nova_admin_password => 'novapassword', + :nova_admin_username => 'admin', + :nova_admin_tenant_name => 'admin', + :nova_admin_password => 'adminpassword', :nova_region_name => 'RegionOne' ) end From 7e05b76998d56fa150620348db7d422a41054a9c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 30 May 2014 16:56:42 +0200 Subject: [PATCH 2/2] neutron: revert some changes for nova notifications It seems we need to use "services" tenant to send notifications to Nova API, using Nova user. --- manifests/network/controller.pp | 8 ++++---- spec/classes/cloud_network_controller_spec.rb | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 4c03334d..0f12a0ac 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -27,10 +27,10 @@ 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_username = 'admin', - $nova_admin_tenant_name = 'admin', - $nova_admin_password = 'adminpassword', + $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', $nova_region_name = 'RegionOne' ) { diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index 9e208a48..91d366af 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -44,10 +44,10 @@ 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_username => 'admin', - :nova_admin_tenant_name => 'admin', - :nova_admin_password => 'adminpassword', + :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', :nova_region_name => 'RegionOne', :api_eth => '10.0.0.1' } end @@ -102,10 +102,10 @@ 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_username => 'admin', - :nova_admin_tenant_name => 'admin', - :nova_admin_password => 'adminpassword', + :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', :nova_region_name => 'RegionOne' ) end