From b54271bacffa34c8232ca7f71109d1212f305853 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 10 Feb 2014 11:50:15 +0100 Subject: [PATCH] compute/neutron: use right Region name Signed-off-by: Emilien Macchi --- manifests/network/compute.pp | 10 ++++++---- spec/classes/cloud_network_compute_spec.rb | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/network/compute.pp b/manifests/network/compute.pp index 1bee3881..e10beee3 100644 --- a/manifests/network/compute.pp +++ b/manifests/network/compute.pp @@ -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 } } diff --git a/spec/classes/cloud_network_compute_spec.rb b/spec/classes/cloud_network_compute_spec.rb index 7a827596..3455d549 100644 --- a/spec/classes/cloud_network_compute_spec.rb +++ b/spec/classes/cloud_network_compute_spec.rb @@ -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