From c493f325b20f5b09fc1b0647e71c82bfc9439eef Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 10 Feb 2014 21:13:23 +0100 Subject: [PATCH] network/metadata: configure region name Close bug #197 Signed-off-by: Emilien Macchi --- manifests/network/metadata.pp | 6 ++++-- spec/classes/cloud_network_metadata_spec.rb | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index 7e29c7bc..4cbbb672 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -25,7 +25,8 @@ class cloud::network::metadata( $ks_nova_internal_host = $os_params::ks_nova_internal_host, $ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, $ks_keystone_admin_port = $os_params::ks_keystone_admin_port, - $ks_keystone_admin_host = $os_params::ks_keystone_admin_host + $ks_keystone_admin_host = $os_params::ks_keystone_admin_host, + $auth_region = $os_params::region ) { include 'cloud::network' @@ -36,7 +37,8 @@ class cloud::network::metadata( debug => $debug, metadata_ip => $ks_nova_internal_host, auth_url => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0", - auth_password => $ks_neutron_password + auth_password => $ks_neutron_password, + auth_region => $auth_region } } diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb index dcd80274..2274fd7e 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -39,6 +39,7 @@ describe 'cloud::network::metadata' do { :debug => true, :enabled => true, :neutron_metadata_proxy_shared_secret => 'secrete', + :auth_region => 'MyRegion', :ks_neutron_password => 'secrete', :ks_nova_internal_host => '10.0.0.1', :ks_keystone_admin_proto => 'http', @@ -86,7 +87,8 @@ describe 'cloud::network::metadata' do :shared_secret => 'secrete', :metadata_ip => '10.0.0.1', :auth_url => 'http://10.0.0.1:35357/v2.0', - :auth_password => 'secrete' + :auth_password => 'secrete', + :auth_region => 'MyRegion' ) end end