stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: revert some changes for nova notifications

Browse Source 
It seems we need to use "services" tenant to send notifications to Nova
API, using Nova user.
This commit is contained in:
Emilien Macchi 2014-05-30 16:56:42 +02:00
parent dfb6109c88
commit 7e05b76998
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/network/controller.pp
View File

@ -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'
) {

16
spec/classes/cloud_network_controller_spec.rb
View File

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