stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network/metadata: configure region name

Browse Source 
Close bug #197

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-10 21:13:23 +01:00
parent 0ae2839db7
commit c493f325b2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/network/metadata.pp
View File

@@ -25,7 +25,8 @@ class cloud::network::metadata(
$ks_nova_internal_host = $os_params::ks_nova_internal_host, $ks_nova_internal_host = $os_params::ks_nova_internal_host,
$ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, $ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto,
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $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' include 'cloud::network'
@@ -36,7 +37,8 @@ class cloud::network::metadata(
debug => $debug, debug => $debug,
metadata_ip => $ks_nova_internal_host, metadata_ip => $ks_nova_internal_host,
auth_url => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0", 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
} }
} }

4
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -39,6 +39,7 @@ describe 'cloud::network::metadata' do
{ :debug => true, { :debug => true,
:enabled => true, :enabled => true,
:neutron_metadata_proxy_shared_secret => 'secrete', :neutron_metadata_proxy_shared_secret => 'secrete',
:auth_region => 'MyRegion',
:ks_neutron_password => 'secrete', :ks_neutron_password => 'secrete',
:ks_nova_internal_host => '10.0.0.1', :ks_nova_internal_host => '10.0.0.1',
:ks_keystone_admin_proto => 'http', :ks_keystone_admin_proto => 'http',
@@ -86,7 +87,8 @@ describe 'cloud::network::metadata' do
:shared_secret => 'secrete', :shared_secret => 'secrete',
:metadata_ip => '10.0.0.1', :metadata_ip => '10.0.0.1',
:auth_url => 'http://10.0.0.1:35357/v2.0', :auth_url => 'http://10.0.0.1:35357/v2.0',
:auth_password => 'secrete' :auth_password => 'secrete',
:auth_region => 'MyRegion'
) )
end end
end end