stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #481 from enovance/nova-notifs

Browse Source 
neutron: revert some changes for nova notifications
This commit is contained in:
Yanis Guenane
2014-06-02 15:24:09 -04:00
parent f555c0b70d 7e05b76998
commit cdacaf1439
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/controller.pp
View File

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

4
spec/classes/cloud_network_controller_spec.rb
View File

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