stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network/metadata: bind IPtables rule on IP

Browse Source 
Close bug #263

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-18 10:34:57 +01:00
parent 50b6b10248
commit 6166c905fe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network/metadata.pp
View File

@@ -22,7 +22,7 @@ class cloud::network::metadata(
$debug = $os_params::debug, $debug = $os_params::debug,
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = $os_params::ks_neutron_password,
$neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret,
$ks_nova_internal_host = $os_params::ks_nova_internal_host, $nova_metadata_server = $os_params::vip_public_ip,
$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,
@@ -35,7 +35,7 @@ class cloud::network::metadata(
enabled => $enabled, enabled => $enabled,
shared_secret => $neutron_metadata_proxy_shared_secret, shared_secret => $neutron_metadata_proxy_shared_secret,
debug => $debug, debug => $debug,
metadata_ip => $ks_nova_internal_host, metadata_ip => $nova_metadata_server,
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 auth_region => $auth_region

2
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -41,7 +41,7 @@ describe 'cloud::network::metadata' do
:neutron_metadata_proxy_shared_secret => 'secrete', :neutron_metadata_proxy_shared_secret => 'secrete',
:auth_region => 'MyRegion', :auth_region => 'MyRegion',
:ks_neutron_password => 'secrete', :ks_neutron_password => 'secrete',
:ks_nova_internal_host => '10.0.0.1', :nova_metadata_server => '10.0.0.1',
:ks_keystone_admin_proto => 'http', :ks_keystone_admin_proto => 'http',
:ks_keystone_admin_port => '35357', :ks_keystone_admin_port => '35357',
:ks_keystone_admin_host => '10.0.0.1' } :ks_keystone_admin_host => '10.0.0.1' }