From 589437d055cb7ec3f523240b9f16bfd5ca497e18 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:16:43 -0500 Subject: [PATCH] Set default parameters for telemetry.pp and telemetry/server.pp Related #1 --- manifests/telemetry.pp | 24 ++++++++++++------------ manifests/telemetry/server.pp | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index ad073b05..c9356594 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -70,18 +70,18 @@ # class cloud::telemetry( - $ceilometer_secret = $os_params::ceilometer_secret, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_keystone_internal_port = $os_params::ks_keystone_internal_port, - $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, - $ks_ceilometer_password = $os_params::ks_ceilometer_password, - $region = $os_params::region, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $log_facility = $os_params::log_facility, - $use_syslog = $os_params::use_syslog, + $ceilometer_secret = 'ceilometersecret', + $rabbit_hosts = ['127.0.0.1:5672'], + $rabbit_password = 'rabbitpassword' , + $ks_keystone_internal_host = '127.0.0.1', + $ks_keystone_internal_port = '5000', + $ks_keystone_internal_proto = 'http', + $ks_ceilometer_password = 'ceilometerpassword', + $region = 'planet42', + $verbose = true, + $debug = true, + $log_facility = 'LOG_LOCAL0', + $use_syslog = true, ){ # Disable twice logging if syslog is enabled diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp index c6df8f8f..aa9ebacf 100644 --- a/manifests/telemetry/server.pp +++ b/manifests/telemetry/server.pp @@ -17,12 +17,12 @@ # class cloud::telemetry::server( - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, - $ks_ceilometer_internal_port = $os_params::ks_ceilometer_internal_port, - $ks_ceilometer_password = $os_params::ks_ceilometer_password, - $api_eth = $os_params::api_eth, - $mongo_nodes = $os_params::mongo_nodes, + $ks_keystone_internal_host = '127.0.0.1', + $ks_keystone_internal_proto = 'http', + $ks_ceilometer_internal_port = '5000', + $ks_ceilometer_password = 'ceilometerpassword', + $api_eth = '127.0.0.1', + $mongo_nodes = ['127.0.0.1:27017'], ){ include 'cloud::telemetry'