From e14cbfc27d1ae921078ee0015f468043764fc134 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 30 Dec 2013 14:22:30 +0100 Subject: [PATCH] Replace $ipaddress_eth0 to $::ipaddress_eth0 Signed-off-by: Emilien Macchi --- manifests/cache.pp | 2 +- manifests/compute/controller.pp | 2 +- manifests/dashboard.pp | 4 ++-- manifests/identity.pp | 2 +- manifests/image.pp | 2 +- manifests/loadbalancer.pp | 2 +- manifests/network/controller.pp | 2 +- manifests/object/controller.pp | 2 +- manifests/object/storage.pp | 2 +- manifests/orchestration/api.pp | 2 +- manifests/rbd/monitor.pp | 4 ++-- manifests/telemetry/server.pp | 2 +- manifests/volume/controller.pp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/cache.pp b/manifests/cache.pp index ceb600ec..ba5ff58a 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -21,7 +21,7 @@ class privatecloud::cache{ class { 'memcached': - listen_ip => $ipaddress_eth0, + listen_ip => $::ipaddress_eth0, max_memory => '60%', } diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp index e02f66af..5a5bbd62 100644 --- a/manifests/compute/controller.pp +++ b/manifests/compute/controller.pp @@ -20,7 +20,7 @@ class privatecloud::compute::controller( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_nova_password = $os_params::ks_nova_password, $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ){ include 'privatecloud::compute' diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 85a3a696..affc900e 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -34,7 +34,7 @@ # # [*local_ip*] # (optional) Local interface used to listen on the Horizon Dashboard -# Defaults to $ipaddress_eth0 +# Defaults to $::ipaddress_eth0 # # [*listen_ssl*] # (optional) Enable SSL on OpenStack Dashboard vhost @@ -46,7 +46,7 @@ class privatecloud::dashboard( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $secret_key = $os_params::secret_key, $horizon_port = $os_params::horizon_port, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, $listen_ssl = false, ) { diff --git a/manifests/identity.pp b/manifests/identity.pp index 8376e227..6cd8d217 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -72,7 +72,7 @@ class privatecloud::identity ( $ks_swift_public_host = $os_params::ks_swift_public_host, $ks_swift_public_port = $os_params::ks_swift_public_port, $ks_swift_public_proto = $os_params::ks_swift_public_proto, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, $region = $os_params::region, $verbose = $os_params::verbose, $debug = $os_params::debug diff --git a/manifests/image.pp b/manifests/image.pp index d6a6f9ff..7350a787 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -24,7 +24,7 @@ class privatecloud::image( $ks_keystone_glance_password = $os_params::ks_glance_password, $rabbit_password = $os_params::rabbit_password, $rabbit_host = $os_params::rabbit_hosts[0], - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ) { $encoded_glance_user = uriescape($glance_db_user) $encoded_glance_password = uriescape($glance_db_password) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 7349d2ee..396b0fa1 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -37,7 +37,7 @@ class privatecloud::loadbalancer( $keepalived_email = $os_params::keepalived_email, $keepalived_interface = 'eth0', $keepalived_ipvs = [], - $keepalived_localhost_ip = $ipaddress_eth0, + $keepalived_localhost_ip = $::ipaddress_eth0, $keepalived_smtp = $os_params::keepalived_smtp, $ks_cinder_ceilometer_port = $os_params::ks_ceilometer_public_port, $ks_cinder_public_port = $os_params::ks_cinder_public_port, diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 1f537ef1..72efd6f6 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -23,7 +23,7 @@ class privatecloud::network::controller( $ks_neutron_password = $os_params::ks_neutron_password, $ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_public_port = $os_params::ks_keystone_public_port, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ) { include 'privatecloud::network' diff --git a/manifests/object/controller.pp b/manifests/object/controller.pp index 911e79a3..3a727825 100644 --- a/manifests/object/controller.pp +++ b/manifests/object/controller.pp @@ -32,7 +32,7 @@ class privatecloud::object::controller( include 'privatecloud::object' class { 'swift::proxy': - proxy_local_net_ip => $ipaddress_eth0, + proxy_local_net_ip => $::ipaddress_eth0, port => $ks_swift_internal_port, pipeline => [ #'catch_errors', 'healthcheck', 'cache', 'bulk', 'ratelimit', diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index a0104023..86214233 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -28,7 +28,7 @@ define set_io_scheduler(){ # swift storage class privatecloud::object::storage ( - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, $swift_zone = undef, $object_port = '6000', $container_port = '6001', diff --git a/manifests/orchestration/api.pp b/manifests/orchestration/api.pp index 9bb1563b..3305f2cd 100644 --- a/manifests/orchestration/api.pp +++ b/manifests/orchestration/api.pp @@ -20,7 +20,7 @@ class privatecloud::orchestration::api( $ks_heat_public_port = $os_params::ks_heat_public_port, $ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, $ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ) { include 'privatecloud::orchestration' diff --git a/manifests/rbd/monitor.pp b/manifests/rbd/monitor.pp index 5a7ef8ec..b8d03017 100644 --- a/manifests/rbd/monitor.pp +++ b/manifests/rbd/monitor.pp @@ -15,8 +15,8 @@ # class privatecloud::rbd::monitor ( - $id => $uniqueid, - $mon_addr => $ipaddress_eth0, + $id => $::uniqueid, + $mon_addr => $::ipaddress_eth0, $monitor_secret => $os_params::ceph_mon_secret ) { diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp index fe1c0e3c..d1c022a8 100644 --- a/manifests/telemetry/server.pp +++ b/manifests/telemetry/server.pp @@ -22,7 +22,7 @@ class privatecloud::telemetry::server( $ks_ceilometer_internal_port = $os_params::ks_keystone_internal_port, $ks_ceilometer_password = $os_params::ks_ceilometer_password, $ceilometer_database_connection = $os_params::ceilometer_database_connection, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ){ include 'privatecloud::telemetry' diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index af653146..54314a19 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -23,7 +23,7 @@ class privatecloud::volume::controller( $ks_swift_internal_proto = $os_params::ks_swift_internal_proto, $ks_swift_internal_host = $os_params::ks_swift_internal_host, $ks_swift_internal_port = $os_params::ks_swift_internal_port, - $local_ip = $ipaddress_eth0, + $local_ip = $::ipaddress_eth0, ) { include 'privatecloud::volume'