stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: change default credentials for nova notifications

Browse Source 
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.
This commit is contained in:
Emilien Macchi
2014-05-28 14:36:29 +02:00
parent a57f1638b1
commit dfb6109c88
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/network/controller.pp
View File

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

12
spec/classes/cloud_network_controller_spec.rb
View File

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