stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Replace $ipaddress_eth0 to $::ipaddress_eth0

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2013-12-30 14:22:30 +01:00
parent 7cf2c6c0f8
commit e14cbfc27d
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/cache.pp
View File

@ -21,7 +21,7 @@
class privatecloud::cache{ class privatecloud::cache{
class { 'memcached': class { 'memcached':
listen_ip => $ipaddress_eth0, listen_ip => $::ipaddress_eth0,
max_memory => '60%', max_memory => '60%',
} }

2
manifests/compute/controller.pp
View File

@ -20,7 +20,7 @@ class privatecloud::compute::controller(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_nova_password = $os_params::ks_nova_password, $ks_nova_password = $os_params::ks_nova_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,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
){ ){
include 'privatecloud::compute' include 'privatecloud::compute'

4
manifests/dashboard.pp
View File

@ -34,7 +34,7 @@
# #
# [*local_ip*] # [*local_ip*]
# (optional) Local interface used to listen on the Horizon Dashboard # (optional) Local interface used to listen on the Horizon Dashboard
# Defaults to $ipaddress_eth0 # Defaults to $::ipaddress_eth0
# #
# [*listen_ssl*] # [*listen_ssl*]
# (optional) Enable SSL on OpenStack Dashboard vhost # (optional) Enable SSL on OpenStack Dashboard vhost
@ -46,7 +46,7 @@ class privatecloud::dashboard(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$secret_key = $os_params::secret_key, $secret_key = $os_params::secret_key,
$horizon_port = $os_params::horizon_port, $horizon_port = $os_params::horizon_port,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
$listen_ssl = false, $listen_ssl = false,
) { ) {

2
manifests/identity.pp
View File

@ -72,7 +72,7 @@ class privatecloud::identity (
$ks_swift_public_host = $os_params::ks_swift_public_host, $ks_swift_public_host = $os_params::ks_swift_public_host,
$ks_swift_public_port = $os_params::ks_swift_public_port, $ks_swift_public_port = $os_params::ks_swift_public_port,
$ks_swift_public_proto = $os_params::ks_swift_public_proto, $ks_swift_public_proto = $os_params::ks_swift_public_proto,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
$region = $os_params::region, $region = $os_params::region,
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug $debug = $os_params::debug

2
manifests/image.pp
View File

@ -24,7 +24,7 @@ class privatecloud::image(
$ks_keystone_glance_password = $os_params::ks_glance_password, $ks_keystone_glance_password = $os_params::ks_glance_password,
$rabbit_password = $os_params::rabbit_password, $rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0], $rabbit_host = $os_params::rabbit_hosts[0],
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
) { ) {
$encoded_glance_user = uriescape($glance_db_user) $encoded_glance_user = uriescape($glance_db_user)
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)

2
manifests/loadbalancer.pp
View File

@ -37,7 +37,7 @@ class privatecloud::loadbalancer(
$keepalived_email = $os_params::keepalived_email, $keepalived_email = $os_params::keepalived_email,
$keepalived_interface = 'eth0', $keepalived_interface = 'eth0',
$keepalived_ipvs = [], $keepalived_ipvs = [],
$keepalived_localhost_ip = $ipaddress_eth0, $keepalived_localhost_ip = $::ipaddress_eth0,
$keepalived_smtp = $os_params::keepalived_smtp, $keepalived_smtp = $os_params::keepalived_smtp,
$ks_cinder_ceilometer_port = $os_params::ks_ceilometer_public_port, $ks_cinder_ceilometer_port = $os_params::ks_ceilometer_public_port,
$ks_cinder_public_port = $os_params::ks_cinder_public_port, $ks_cinder_public_port = $os_params::ks_cinder_public_port,

2
manifests/network/controller.pp
View File

@ -23,7 +23,7 @@ class privatecloud::network::controller(
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = $os_params::ks_neutron_password,
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = $os_params::ks_keystone_admin_host,
$ks_keystone_public_port = $os_params::ks_keystone_public_port, $ks_keystone_public_port = $os_params::ks_keystone_public_port,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
) { ) {
include 'privatecloud::network' include 'privatecloud::network'

2
manifests/object/controller.pp
View File

@ -32,7 +32,7 @@ class privatecloud::object::controller(
include 'privatecloud::object' include 'privatecloud::object'
class { 'swift::proxy': class { 'swift::proxy':
proxy_local_net_ip => $ipaddress_eth0, proxy_local_net_ip => $::ipaddress_eth0,
port => $ks_swift_internal_port, port => $ks_swift_internal_port,
pipeline => [ pipeline => [
#'catch_errors', 'healthcheck', 'cache', 'bulk', 'ratelimit', #'catch_errors', 'healthcheck', 'cache', 'bulk', 'ratelimit',

2
manifests/object/storage.pp
View File

@ -28,7 +28,7 @@ define set_io_scheduler(){
# swift storage # swift storage
class privatecloud::object::storage ( class privatecloud::object::storage (
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
$swift_zone = undef, $swift_zone = undef,
$object_port = '6000', $object_port = '6000',
$container_port = '6001', $container_port = '6001',

2
manifests/orchestration/api.pp
View File

@ -20,7 +20,7 @@ class privatecloud::orchestration::api(
$ks_heat_public_port = $os_params::ks_heat_public_port, $ks_heat_public_port = $os_params::ks_heat_public_port,
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_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, $ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
) { ) {
include 'privatecloud::orchestration' include 'privatecloud::orchestration'

4
manifests/rbd/monitor.pp
View File

@ -15,8 +15,8 @@
# #
class privatecloud::rbd::monitor ( class privatecloud::rbd::monitor (
$id => $uniqueid, $id => $::uniqueid,
$mon_addr => $ipaddress_eth0, $mon_addr => $::ipaddress_eth0,
$monitor_secret => $os_params::ceph_mon_secret $monitor_secret => $os_params::ceph_mon_secret
) { ) {

2
manifests/telemetry/server.pp
View File

@ -22,7 +22,7 @@ class privatecloud::telemetry::server(
$ks_ceilometer_internal_port = $os_params::ks_keystone_internal_port, $ks_ceilometer_internal_port = $os_params::ks_keystone_internal_port,
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_password = $os_params::ks_ceilometer_password,
$ceilometer_database_connection = $os_params::ceilometer_database_connection, $ceilometer_database_connection = $os_params::ceilometer_database_connection,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
){ ){
include 'privatecloud::telemetry' include 'privatecloud::telemetry'

2
manifests/volume/controller.pp
View File

@ -23,7 +23,7 @@ class privatecloud::volume::controller(
$ks_swift_internal_proto = $os_params::ks_swift_internal_proto, $ks_swift_internal_proto = $os_params::ks_swift_internal_proto,
$ks_swift_internal_host = $os_params::ks_swift_internal_host, $ks_swift_internal_host = $os_params::ks_swift_internal_host,
$ks_swift_internal_port = $os_params::ks_swift_internal_port, $ks_swift_internal_port = $os_params::ks_swift_internal_port,
$local_ip = $ipaddress_eth0, $local_ip = $::ipaddress_eth0,
) { ) {
include 'privatecloud::volume' include 'privatecloud::volume'