From 82265d36f3ced989124dea1551906f1dd8167822 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 12:18:13 -0500 Subject: [PATCH] Set default parameters for object.pp and object/*.pp Related #1 --- manifests/object.pp | 2 +- manifests/object/controller.pp | 22 +++++++++++----------- manifests/object/ringbuilder.pp | 6 +++--- manifests/object/storage.pp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/object.pp b/manifests/object.pp index dd542c80..d7fac1d5 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -25,7 +25,7 @@ # class cloud::object( - $swift_hash_suffix = $os_params::swift_hash_suffix + $swift_hash_suffix = 'ni2aseiWi8ich3oo' ) { class { 'ssh::server::install': } diff --git a/manifests/object/controller.pp b/manifests/object/controller.pp index 923b4338..43b5dee4 100644 --- a/manifests/object/controller.pp +++ b/manifests/object/controller.pp @@ -17,17 +17,17 @@ # class cloud::object::controller( - $ks_keystone_admin_host = $os_params::ks_keystone_admin_host, - $ks_keystone_admin_port = $os_params::ks_keystone_admin_port, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_keystone_internal_port = $os_params::ks_keystone_internal_port, - $ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password, - $ks_swift_internal_port = $os_params::ks_swift_internal_port, - $ks_swift_password = $os_params::ks_swift_password, - $statsd_host = $os_params::statsd_host, - $statsd_port = $os_params::statsd_port, - $memcache_servers = $os_params::memcache_servers, - $api_eth = $os_params::api_eth, + $ks_keystone_admin_host = '127.0.0.1', + $ks_keystone_admin_port = 35357, + $ks_keystone_internal_host = '127.0.0.1', + $ks_keystone_internal_port = 5000, + $ks_swift_dispersion_password = 'dispersion', + $ks_swift_internal_port = 8080, + $ks_swift_password = 'swiftpassword', + $statsd_host = '127.0.0.1', + $statsd_port = 4125, + $memcache_servers = ['127.0.0.1:11211'], + $api_eth = '127.0.0.1', ) { include 'cloud::object' diff --git a/manifests/object/ringbuilder.pp b/manifests/object/ringbuilder.pp index c8f440c1..4889b978 100644 --- a/manifests/object/ringbuilder.pp +++ b/manifests/object/ringbuilder.pp @@ -17,9 +17,9 @@ # class cloud::object::ringbuilder( - $rsyncd_ipaddress = $os_params::internal_netif_ip, - $replicas = $os_params::replicas, - $swift_rsync_max_connections = $os_params::swift_rsync_max_connections, + $rsyncd_ipaddress = '127.0.0.1', + $replicas = 3, + $swift_rsync_max_connections = 5, ) { Ring_object_device <<| |>> diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index 8512a354..c32dfc5b 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -19,7 +19,7 @@ import 'set_io_scheduler.pp' # swift storage class cloud::object::storage ( - $storage_eth = $os_params::storage_eth, + $storage_eth = '127.0.0.1', $swift_zone = undef, $object_port = '6000', $container_port = '6001',