From fbeef945c5b8f5c4a28b13de10cfa8851ab7be56 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 18 Feb 2014 10:34:57 +0100 Subject: [PATCH] network/metadata: bind IPtables rule on IP Close bug #263 Signed-off-by: Emilien Macchi --- manifests/network/metadata.pp | 4 ++-- spec/classes/cloud_network_metadata_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index 4cbbb672..d6af8952 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -22,7 +22,7 @@ class cloud::network::metadata( $debug = $os_params::debug, $ks_neutron_password = $os_params::ks_neutron_password, $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_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_host = $os_params::ks_keystone_admin_host, @@ -35,7 +35,7 @@ class cloud::network::metadata( enabled => $enabled, shared_secret => $neutron_metadata_proxy_shared_secret, 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_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 2274fd7e..e173fcde 100644 --- a/spec/classes/cloud_network_metadata_spec.rb +++ b/spec/classes/cloud_network_metadata_spec.rb @@ -41,7 +41,7 @@ describe 'cloud::network::metadata' do :neutron_metadata_proxy_shared_secret => 'secrete', :auth_region => 'MyRegion', :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_port => '35357', :ks_keystone_admin_host => '10.0.0.1' }