stackforge/puppet-openstack-cloud
Code Issues Proposed changes

compute/neutron: use right Region name

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-10 11:50:15 +01:00
parent 203d9b47d1
commit b54271bacf
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/network/compute.pp
View File

@@ -17,9 +17,10 @@
#
class cloud::network::compute(
$neutron_endpoint = $os_params::ks_neutron_admin_host,
$neutron_protocol = $os_params::ks_neutron_public_proto,
$neutron_password = $os_params::ks_neutron_password,
$neutron_endpoint = $os_params::ks_neutron_admin_host,
$neutron_protocol = $os_params::ks_neutron_public_proto,
$neutron_password = $os_params::ks_neutron_password,
$neutron_region_name = $os_params::region
) {
include 'cloud::network'
@@ -27,7 +28,8 @@ class cloud::network::compute(
class { 'nova::network::neutron':
neutron_admin_password => $neutron_password,
neutron_admin_auth_url => "${neutron_protocol}://${neutron_endpoint}:35357/v2.0",
neutron_url => "${neutron_protocol}://${neutron_endpoint}:9696"
neutron_url => "${neutron_protocol}://${neutron_endpoint}:9696",
neutron_region_name => $neutron_region_name
}
}

2
spec/classes/cloud_network_compute_spec.rb
View File

@@ -37,6 +37,7 @@ describe 'cloud::network::compute' do
let :params do
{ :neutron_protocol => 'http',
:neutron_endpoint => '10.0.0.1',
:neutron_region_name => 'MyRegion',
:neutron_password => 'secrete' }
end
@@ -75,6 +76,7 @@ describe 'cloud::network::compute' do
should contain_class('nova::network::neutron').with(
:neutron_admin_password => 'secrete',
:neutron_admin_auth_url => 'http://10.0.0.1:35357/v2.0',
:neutron_region_name => 'MyRegion',
:neutron_url => 'http://10.0.0.1:9696'
)
end