From 7b9409786ca143f372a196452c96410f8d412f77 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 09:52:52 -0500 Subject: [PATCH 01/20] Set default parameters for loadbalance.pp Related to #1 --- manifests/loadbalancer.pp | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 67e859c4..f9ecb5db 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -16,7 +16,7 @@ # HAproxy nodes # class cloud::loadbalancer( - $swift_api = $os_params::swift, + $swift_api = true, $ceilometer_api = true, $cinder_api = true, $glance_api = true, @@ -33,30 +33,30 @@ class cloud::loadbalancer( $horizon = true, $horizon_ssl = false, $spice = true, - $haproxy_auth = $os_params::haproxy_auth, + $haproxy_auth = 'admin:changeme', $keepalived_state = 'BACKUP', $keepalived_priority = 50, - $keepalived_interface = $os_params::keepalived_interface, - $keepalived_ipvs = [$os_params::vip_public_ip,$os_params::galera_ip], - $keepalived_localhost_ip = $os_params::keepalived_localhost_ip, - $ks_cinder_public_port = $os_params::ks_cinder_public_port, - $ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, - $ks_ec2_public_port = $os_params::ks_ec2_public_port, - $ks_glance_api_public_port = $os_params::ks_glance_api_public_port, - $ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_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_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, - $ks_keystone_admin_port = $os_params::ks_keystone_admin_port, - $ks_keystone_public_port = $os_params::ks_keystone_public_port, - $ks_metadata_public_port = $os_params::ks_metadata_public_port, - $ks_neutron_public_port = $os_params::ks_neutron_public_port, - $ks_nova_public_port = $os_params::ks_nova_public_port, - $ks_swift_public_port = $os_params::ks_swift_public_port, - $horizon_port = $os_params::horizon_port, - $spice_port = $os_params::spice_port, - $vip_public_ip = $os_params::vip_public_ip, - $galera_ip = $os_params::galera_ip + $keepalived_interface = 'eth0', + $keepalived_ipvs = ['127.0.0.1'], + $keepalived_localhost_ip = '127.0.0.1', + $ks_cinder_public_port = 8776, + $ks_ceilometer_public_port = 8777, + $ks_ec2_public_port = 8773, + $ks_glance_api_public_port = 9292, + $ks_glance_registry_internal_port = 9191, + $ks_heat_public_port = 8004, + $ks_heat_cfn_public_port = 8000, + $ks_heat_cloudwatch_public_port = 8003, + $ks_keystone_admin_port = 35357, + $ks_keystone_public_port = 5000, + $ks_metadata_public_port = 8775, + $ks_neutron_public_port = 9696, + $ks_nova_public_port = 8774, + $ks_swift_public_port = 8080, + $horizon_port = 80, + $spice_port = 6082, + $vip_public_ip = '127.0.0.2', + $galera_ip = '127.0.0.1' ){ # Ensure Keepalived is started before HAproxy to avoid binding errors. From 419c5292a009ad7e2b47c7fcf6d4d040cbf31894 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:00:10 -0500 Subject: [PATCH 02/20] Set default parameters for cache.pp Related #1 --- manifests/cache.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/cache.pp b/manifests/cache.pp index b6bb7c32..e4ff37fe 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -25,7 +25,7 @@ # class cloud::cache ( - $listen_ip = $os_params::internal_netif_ip, + $listen_ip = '127.0.0.1', ){ class { 'memcached': From 16cce32232a61797fdd2995c88752a26ba352259 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:03:13 -0500 Subject: [PATCH 03/20] Set default parameters for spof.pp Related #1 --- manifests/spof.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/spof.pp b/manifests/spof.pp index 8e98680f..333ee5cb 100644 --- a/manifests/spof.pp +++ b/manifests/spof.pp @@ -29,7 +29,7 @@ # class cloud::spof( - $cluster_ip = $os_params::cluster_ip, + $cluster_ip = '127.0.0.1', $multicast_address = '239.1.1.2' ) { From 589437d055cb7ec3f523240b9f16bfd5ca497e18 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:16:43 -0500 Subject: [PATCH 04/20] 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' From 0965e9d6aa3691a7e88d39f5acff7e746c4f6e4f Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:29:24 -0500 Subject: [PATCH 05/20] Set default parameters for database/nosql.pp and database/sql.pp Related to #1 --- manifests/database/nosql.pp | 4 +-- manifests/database/sql.pp | 64 ++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index fd09d5ef..85aedf2a 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -36,9 +36,9 @@ # class cloud::database::nosql( - $bind_ip = $os_params::internal_netif_ip, + $bind_ip = '127.0.0.1', $nojournal = false, - $replset_members = $os_params::mongo_nodes + $replset_members = ['mgmt001'] ) { # bind_ip should be an array diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index a80fc535..0daaaa23 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -20,39 +20,39 @@ # [*galera_internal_ips*] # Array of internal ip of the galera nodes. class cloud::database::sql ( - $api_eth = $os_params::api_eth, + $api_eth = '127.0.0.1', $service_provider = 'sysv', - $galera_master_name = $os_params::galera_master_name, - $galera_internal_ips = $os_params::galera_internal_ips, - $keystone_db_host = $os_params::keystone_db_host, - $keystone_db_user = $os_params::keystone_db_user, - $keystone_db_password = $os_params::keystone_db_password, - $keystone_db_allowed_hosts = $os_params::keystone_db_allowed_hosts, - $cinder_db_host = $os_params::cinder_db_host, - $cinder_db_user = $os_params::cinder_db_user, - $cinder_db_password = $os_params::cinder_db_password, - $cinder_db_allowed_hosts = $os_params::cinder_db_allowed_hosts, - $glance_db_host = $os_params::glance_db_host, - $glance_db_user = $os_params::glance_db_user, - $glance_db_password = $os_params::glance_db_password, - $glance_db_allowed_hosts = $os_params::glance_db_allowed_hosts, - $heat_db_host = $os_params::heat_db_host, - $heat_db_user = $os_params::heat_db_user, - $heat_db_password = $os_params::heat_db_password, - $heat_db_allowed_hosts = $os_params::heat_db_allowed_hosts, - $nova_db_host = $os_params::nova_db_host, - $nova_db_user = $os_params::nova_db_user, - $nova_db_password = $os_params::nova_db_password, - $nova_db_allowed_hosts = $os_params::nova_db_allowed_hosts, - $neutron_db_host = $os_params::neutron_db_host, - $neutron_db_user = $os_params::neutron_db_user, - $neutron_db_password = $os_params::neutron_db_password, - $neutron_db_allowed_hosts = $os_params::neutron_db_allowed_hosts, - $mysql_root_password = $os_params::mysql_root_password, - $mysql_sys_maint_password = $os_params::mysql_sys_maint_password, - $galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser, - $galera_clustercheck_dbpassword = $os_params::galera_clustercheck_dbpassword, - $galera_clustercheck_ipaddress = $os_params::internal_netif_ip + $galera_master_name = 'mgmt001', + $galera_internal_ips = ['127.0.0.1'], + $keystone_db_host = '127.0.0.1', + $keystone_db_user = 'keystone', + $keystone_db_password = 'keystonepassword', + $keystone_db_allowed_hosts = ['127.0.0.1'], + $cinder_db_host = '127.0.0.1', + $cinder_db_user = 'cinder', + $cinder_db_password = 'cinderpassword', + $cinder_db_allowed_hosts = ['127.0.0.1'], + $glance_db_host = '127.0.0.1', + $glance_db_user = 'glance', + $glance_db_password = 'glancepassword', + $glance_db_allowed_hosts = ['127.0.0.1'], + $heat_db_host = '127.0.0.1', + $heat_db_user = 'heat', + $heat_db_password = 'heatpassword', + $heat_db_allowed_hosts = ['127.0.0.1'], + $nova_db_host = '127.0.0.1', + $nova_db_user = 'nova', + $nova_db_password = 'novapassword', + $nova_db_allowed_hosts = ['127.0.0.1'], + $neutron_db_host = '127.0.0.1', + $neutron_db_user = 'neutron', + $neutron_db_password = 'neutronpassword', + $neutron_db_allowed_hosts = ['127.0.0.1'], + $mysql_root_password = 'rootpassword', + $mysql_sys_maint_password = 'sys_maint', + $galera_clustercheck_dbuser = 'clustercheckdbuser', + $galera_clustercheck_dbpassword = 'clustercheckpassword', + $galera_clustercheck_ipaddress = '127.0.0.1' ) { include 'xinetd' From c449a7d48069955fbea523e83eb6f55d1a1784d3 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:32:17 -0500 Subject: [PATCH 06/20] Set default parameters for messaging.pp Related #1 --- manifests/messaging.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/messaging.pp b/manifests/messaging.pp index 8f31d62e..89d91839 100644 --- a/manifests/messaging.pp +++ b/manifests/messaging.pp @@ -33,9 +33,9 @@ # Defaults to 'disc' class cloud::messaging( - $rabbit_names = $os_params::rabbit_names, - $rabbit_password = $os_params::rabbit_password, - $cluster_node_type = 'disc' + $cluster_node_type = 'disc', + $rabbit_names = ['mgmt001'], + $rabbit_password = 'rabbitpassword' ){ # Packaging issue: https://bugzilla.redhat.com/show_bug.cgi?id=1033305 From f0c36b42fa7d34bb5af479893bff92f15a7cc5c3 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:39:13 -0500 Subject: [PATCH 07/20] Set default parameters for image.pp Related #1 --- manifests/image.pp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/manifests/image.pp b/manifests/image.pp index e57d23ab..ca32af44 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -68,24 +68,24 @@ # Defaults value in params # class cloud::image( - $glance_db_host = $os_params::glance_db_host, - $glance_db_user = $os_params::glance_db_user, - $glance_db_password = $os_params::glance_db_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_glance_internal_host = $os_params::ks_glance_internal_host, - $ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port, - $ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port, - $ks_glance_password = $os_params::ks_glance_password, - $rabbit_password = $os_params::rabbit_password, - $rabbit_host = $os_params::rabbit_host, - $api_eth = $os_params::api_eth, - $openstack_vip = $os_params::vip_public_ip, - $glance_rbd_pool = $os_params::glance_rbd_pool, - $glance_rbd_user = $os_params::glance_rbd_user, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $log_facility = $os_params::log_facility, - $use_syslog = $os_params::use_syslog + $glance_db_host = '127.0.0.1', + $glance_db_user = 'glance', + $glance_db_password = 'glancepassword', + $ks_keystone_internal_host = '127.0.0.1', + $ks_glance_internal_host = '127.0.0.1', + $ks_glance_api_internal_port = 9292, + $ks_glance_registry_internal_port = 9191, + $ks_glance_password = 'glancepassword', + $rabbit_password = 'rabbitpassword', + $rabbit_host = '127.0.0.1', + $api_eth = '127.0.0.1', + $openstack_vip = '127.0.0.2', + $glance_rbd_pool = 'images', + $glance_rbd_user = 'glance', + $verbose = true, + $debug = true, + $log_facility = 'LOG_LOCAL0', + $use_syslog = true ) { # Disable twice logging if syslog is enabled From a652f78d2f66305dab57c654d416869c5b311df0 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:47:57 -0500 Subject: [PATCH 08/20] Set default parameters for orchestration.pp orchestration/api.pp and orchestration/engine.pp Related #1 --- manifests/orchestration.pp | 36 +++++++++++++++---------------- manifests/orchestration/api.pp | 8 +++---- manifests/orchestration/engine.pp | 12 +++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index 68c0b412..140aad5d 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -92,24 +92,24 @@ # Defaults value in params # class cloud::orchestration( - $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_keystone_admin_host = $os_params::ks_keystone_admin_host, - $ks_keystone_admin_port = $os_params::ks_keystone_admin_port, - $ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, - $ks_heat_public_host = $os_params::ks_heat_public_host, - $ks_heat_public_proto = $os_params::ks_heat_public_proto, - $ks_heat_password = $os_params::ks_heat_password, - $heat_db_host = $os_params::heat_db_host, - $heat_db_user = $os_params::heat_db_user, - $heat_db_password = $os_params::heat_db_password, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $use_syslog = $os_params::use_syslog, - $log_facility = $os_params::log_facility + $ks_keystone_internal_host = '127.0.0.1', + $ks_keystone_internal_port = '5000', + $ks_keystone_internal_proto = 'http', + $ks_keystone_admin_host = '127.0.0.1', + $ks_keystone_admin_port = '35357', + $ks_keystone_admin_proto = 'http', + $ks_heat_public_host = '127.0.0.1', + $ks_heat_public_proto = 'http', + $ks_heat_password = 'heatpassword', + $heat_db_host = '127.0.0.1', + $heat_db_user = 'heat', + $heat_db_password = 'heatpassword', + $rabbit_hosts = ['127.0.0.1:5672'], + $rabbit_password = 'rabbitpassword', + $verbose = true, + $debug = true, + $use_syslog = true, + $log_facility = 'LOG_LOCAL0' ) { # Disable twice logging if syslog is enabled diff --git a/manifests/orchestration/api.pp b/manifests/orchestration/api.pp index 60732da4..3a2a8718 100644 --- a/manifests/orchestration/api.pp +++ b/manifests/orchestration/api.pp @@ -17,10 +17,10 @@ # class cloud::orchestration::api( - $ks_heat_internal_port = $os_params::ks_heat_internal_port, - $ks_heat_cfn_internal_port = $os_params::ks_heat_cfn_internal_port, - $ks_heat_cloudwatch_internal_port = $os_params::ks_heat_cloudwatch_internal_port, - $api_eth = $os_params::api_eth, + $ks_heat_internal_port = 8004, + $ks_heat_cfn_internal_port = 8000, + $ks_heat_cloudwatch_internal_port = 8003, + $api_eth = '127.0.0.1', ) { include 'cloud::orchestration' diff --git a/manifests/orchestration/engine.pp b/manifests/orchestration/engine.pp index 0502bf21..f92945f0 100644 --- a/manifests/orchestration/engine.pp +++ b/manifests/orchestration/engine.pp @@ -19,12 +19,12 @@ class cloud::orchestration::engine( $enabled = true, - $ks_heat_public_host = $os_params::ks_heat_public_host, - $ks_heat_public_proto = $os_params::ks_heat_public_proto, - $ks_heat_password = $os_params::ks_heat_password, - $ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, - $ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, - $auth_encryption_key = $os_params::heat_auth_encryption_key + $ks_heat_public_host = '127.0.0.1', + $ks_heat_public_proto = 'http', + $ks_heat_password = 'heatpassword', + $ks_heat_cfn_public_port = 8000, + $ks_heat_cloudwatch_public_port = 8003, + $auth_encryption_key = 'secrete' ) { include 'cloud::orchestration' From c6e00519e6905d3f1e6b4e23967cc1b6db2ff724 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 11:13:37 -0500 Subject: [PATCH 09/20] Set default parameters for identity.pp Related #1 --- manifests/identity.pp | 140 +++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index afffee48..01cd0789 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -328,76 +328,76 @@ # Defaults value in params # class cloud::identity ( - $swift_enabled = $os_params::swift, - $identity_roles_addons = $os_params::identity_roles_addons, - $keystone_db_host = $os_params::keystone_db_host, - $keystone_db_user = $os_params::keystone_db_user, - $keystone_db_password = $os_params::keystone_db_password, - $ks_admin_email = $os_params::ks_admin_email, - $ks_admin_password = $os_params::ks_admin_password, - $ks_admin_tenant = $os_params::ks_admin_tenant, - $ks_admin_token = $os_params::ks_admin_token, - $ks_ceilometer_admin_host = $os_params::ks_ceilometer_admin_host, - $ks_ceilometer_internal_host = $os_params::ks_ceilometer_internal_host, - $ks_ceilometer_password = $os_params::ks_ceilometer_password, - $ks_ceilometer_public_host = $os_params::ks_ceilometer_public_host, - $ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, - $ks_ceilometer_public_proto = $os_params::ks_ceilometer_public_proto, - $ks_cinder_admin_host = $os_params::ks_cinder_admin_host, - $ks_cinder_internal_host = $os_params::ks_cinder_internal_host, - $ks_cinder_password = $os_params::ks_cinder_password, - $ks_cinder_public_host = $os_params::ks_cinder_public_host, - $ks_cinder_public_proto = $os_params::ks_cinder_public_proto, - $ks_cinder_public_port = $os_params::ks_cinder_public_port, - $ks_glance_admin_host = $os_params::ks_glance_admin_host, - $ks_glance_internal_host = $os_params::ks_glance_internal_host, - $ks_glance_password = $os_params::ks_glance_password, - $ks_glance_public_host = $os_params::ks_glance_public_host, - $ks_glance_public_proto = $os_params::ks_glance_public_proto, - $ks_glance_api_public_port = $os_params::ks_glance_api_public_port, - $ks_heat_admin_host = $os_params::ks_heat_admin_host, - $ks_heat_internal_host = $os_params::ks_heat_internal_host, - $ks_heat_password = $os_params::ks_heat_password, - $ks_heat_public_host = $os_params::ks_heat_public_host, - $ks_heat_public_proto = $os_params::ks_heat_public_proto, - $ks_heat_public_port = $os_params::ks_heat_public_port, - $ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, - $ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, - $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_keystone_public_host = $os_params::ks_keystone_public_host, - $ks_keystone_public_port = $os_params::ks_keystone_public_port, - $ks_keystone_public_proto = $os_params::ks_keystone_public_proto, - $ks_neutron_admin_host = $os_params::ks_neutron_admin_host, - $ks_neutron_internal_host = $os_params::ks_neutron_internal_host, - $ks_neutron_password = $os_params::ks_neutron_password, - $ks_neutron_public_host = $os_params::ks_neutron_public_host, - $ks_neutron_public_proto = $os_params::ks_neutron_public_proto, - $ks_neutron_public_port = $os_params::ks_neutron_public_port, - $ks_nova_admin_host = $os_params::ks_nova_admin_host, - $ks_nova_internal_host = $os_params::ks_nova_internal_host, - $ks_nova_password = $os_params::ks_nova_password, - $ks_nova_public_host = $os_params::ks_nova_public_host, - $ks_nova_public_proto = $os_params::ks_nova_public_proto, - $ks_nova_public_port = $os_params::ks_nova_public_port, - $ks_ec2_public_port = $os_params::ks_ec2_public_port, - $ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password, - $ks_swift_internal_host = $os_params::ks_swift_internal_host, - $ks_swift_admin_host = $os_params::ks_swift_admin_host, - $ks_swift_password = $os_params::ks_swift_password, - $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, - $api_eth = $os_params::api_eth, - $region = $os_params::region, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $log_facility = $os_params::log_facility, - $use_syslog = $os_params::use_syslog, - $token_driver = 'keystone.token.backends.sql.Token', - $ks_token_expiration = $os_params::ks_token_expiration, + $swift_enabled = true, + $identity_roles_addons = ['SwiftOperator', 'ResellerAdmin'], + $keystone_db_host = '127.0.0.1', + $keystone_db_user = 'keystone', + $keystone_db_password = 'keystonepassword', + $memcache_servers = ['127.0.0.1:11211'], + $ks_admin_email = 'no-reply@keystone.openstack', + $ks_admin_password = 'adminpassword', + $ks_admin_tenant = 'admin', + $ks_admin_token = 'iw3feche3JeeYo9mejoohaugai3thohahwo9tiuyoe5Thier8Eiwah8K', + $ks_ceilometer_admin_host = '127.0.0.1', + $ks_ceilometer_internal_host = '127.0.0.1', + $ks_ceilometer_password = 'ceilometerpassword', + $ks_ceilometer_public_host = '127.0.0.1', + $ks_ceilometer_public_port = 8777, + $ks_ceilometer_public_proto = 'http', + $ks_cinder_admin_host = '127.0.0.1', + $ks_cinder_internal_host = '127.0.0.1', + $ks_cinder_password = 'cinderpassword', + $ks_cinder_public_host = '127.0.0.1', + $ks_cinder_public_proto = 'http', + $ks_cinder_public_port = 8776, + $ks_glance_admin_host = '127.0.0.1', + $ks_glance_internal_host = '127.0.0.1', + $ks_glance_password = 'glancepassword', + $ks_glance_public_host = '127.0.0.1', + $ks_glance_public_proto = 'http', + $ks_glance_api_public_port = 9292, + $ks_heat_admin_host = '127.0.0.1', + $ks_heat_internal_host = '127.0.0.1', + $ks_heat_password = 'heatpassword', + $ks_heat_public_host = '127.0.0.1', + $ks_heat_public_proto = 'http', + $ks_heat_public_port = 8004, + $ks_heat_cfn_public_port = 8000, + $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_keystone_public_host = '127.0.0.1', + $ks_keystone_public_port = 5000, + $ks_keystone_public_proto = 'http', + $ks_neutron_admin_host = '127.0.0.1', + $ks_neutron_internal_host = '127.0.0.1', + $ks_neutron_password = 'neutronpassword', + $ks_neutron_public_host = '127.0.0.1', + $ks_neutron_public_proto = 'http', + $ks_neutron_public_port = 9696, + $ks_nova_admin_host = '127.0.0.1', + $ks_nova_internal_host = '127.0.0.1', + $ks_nova_password = 'novapassword', + $ks_nova_public_host = '127.0.0.1', + $ks_nova_public_proto = 'http', + $ks_nova_public_port = 8774, + $ks_ec2_public_port = 8773, + $ks_swift_dispersion_password = 'dispersion', + $ks_swift_internal_host = '127.0.0.1', + $ks_swift_admin_host = '127.0.0.1', + $ks_swift_password = 'swiftpassword', + $ks_swift_public_host = '127.0.0.1', + $ks_swift_public_port = 8080, + $ks_swift_public_proto = 'http', + $api_eth = '127.0.0.1', + $region = 'planet42', + $verbose = true, + $debug = true, + $log_facility = 'LOG_LOCAL0', + $use_syslog = true, + $ks_token_expiration = 3600, + $ks_token_driver = 'keystone.token.backends.sql.Token' ){ $encoded_user = uriescape($keystone_db_user) From ea87409ef7e40a9e0818873b542e8c7b7891a800 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 11:26:17 -0500 Subject: [PATCH 10/20] Set default parameters for dashboard.pp Related #1 --- manifests/dashboard.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 4a0cd7b9..28971b07 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -75,16 +75,16 @@ # class cloud::dashboard( - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $secret_key = $os_params::secret_key, - $horizon_port = $os_params::horizon_port, - $api_eth = $os_params::api_eth, + $ks_keystone_internal_host = '127.0.0.1', + $secret_key = 'secrete', + $horizon_port = 80, $servername = $::fqdn, + $api_eth = '127.0.0.1', $listen_ssl = false, - $keystone_host = $os_params::ks_keystone_internal_host, - $keystone_proto = $os_params::ks_keystone_internal_proto, - $keystone_port = $os_params::ks_keystone_internal_port, - $debug = $os_params::debug, + $keystone_host = '127.0.0.1', + $keystone_proto = 'http', + $keystone_port = 5000, + $debug = true, $listen_ssl = false, $horizon_cert = undef, $horizon_key = undef, From 610cb2b2f0a0e21afef92662a7c079ce8b0ad431 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 11:55:55 -0500 Subject: [PATCH 11/20] Set default parameters for compute.pp compute/hypervisor.pp and compute/controller.pp Related #1 --- manifests/compute.pp | 34 +++++++++++------------ manifests/compute/controller.pp | 16 +++++------ manifests/compute/hypervisor.pp | 48 ++++++++++++++++++++++++++------- 3 files changed, 63 insertions(+), 35 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index dd7baa9e..c9b6130b 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -69,23 +69,23 @@ # class cloud::compute( - $nova_db_host = $os_params::nova_db_host, - $nova_db_user = $os_params::nova_db_user, - $nova_db_password = $os_params::nova_db_password, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $ks_glance_internal_host = $os_params::ks_glance_internal_host, - $glance_api_port = $os_params::ks_glance_api_internal_port, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $use_syslog = $os_params::use_syslog, - $log_facility = $os_params::log_facility, - $neutron_endpoint = $os_params::ks_neutron_admin_host, - $neutron_protocol = $os_params::ks_neutron_admin_proto, - $neutron_password = $os_params::ks_neutron_password, - $neutron_region_name = $os_params::region, - $memcache_servers = $os_params::memcache_servers, - $availability_zone = $os_params::region + $nova_db_host = '127.0.0.1', + $nova_db_user = 'nova', + $nova_db_password = 'novapassword', + $rabbit_hosts = ['127.0.0.1:5672'], + $rabbit_password = 'rabbitpassword', + $ks_glance_internal_host = '127.0.0.1', + $glance_api_port = 9292, + $verbose = true, + $debug = true, + $use_syslog = true, + $log_facility = 'LOG_LOCAL0', + $neutron_endpoint = '127.0.0.1', + $neutron_protocol = 'http', + $neutron_password = 'neutronpassword', + $neutron_region_name = 'planet42', + $memcache_servers = ['127.0.0.1:11211'], + $availability_zone = 'planet42' ) { if !defined(Resource['nova_config']) { diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp index b0fe0555..ab4b53b9 100644 --- a/manifests/compute/controller.pp +++ b/manifests/compute/controller.pp @@ -17,14 +17,14 @@ # class cloud::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, - $api_eth = $os_params::api_eth, - $spice_port = $os_params::spice_port, - $ks_nova_public_port = $os_params::ks_nova_public_port, - $ks_ec2_public_port = $os_params::ks_ec2_public_port, - $ks_metadata_public_port = $os_params::ks_metadata_public_port + $ks_keystone_internal_host = '127.0.0.1', + $ks_nova_password = 'novapassword', + $neutron_metadata_proxy_shared_secret = 'asecreteaboutneutron', + $api_eth = '127.0.0.1', + $spice_port = 6082, + $ks_nova_public_port = 8774, + $ks_ec2_public_port = 8773, + $ks_metadata_public_port = 8775 ){ include 'cloud::compute' diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index d0062f9f..ba6bf83f 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -27,16 +27,44 @@ # class cloud::compute::hypervisor( - $server_proxyclient_address = $os_params::internal_netif_ip, - $libvirt_type = $os_params::libvirt_type, - $ks_nova_public_proto = $os_params::ks_nova_public_proto, - $ks_nova_public_host = $os_params::ks_nova_public_host, - $nova_ssh_private_key = $os_params::nova_ssh_private_key, - $nova_ssh_public_key = $os_params::nova_ssh_public_key, - $spice_port = $os_params::spice_port, - $cinder_rbd_user = $os_params::cinder_rbd_user, - $nova_rbd_pool = $os_params::nova_rbd_pool, - $nova_rbd_secret_uuid = $os_params::ceph_fsid, + $server_proxyclient_address = '127.0.0.1', + $libvirt_type = 'kvm', + $ks_nova_public_proto = 'http', + $ks_nova_public_host = '127.0.0.1', + $nova_ssh_private_key = ' + -----BEGIN RSA PRIVATE KEY----- + MIIEpAIBAAKCAQEAy0QCW1bYo1jLDrkqRp2qIi4HcY2ZThG/D0zR4I2eWSkEXRnX + F/cOerM8BLYoCOa2BAXunSIEaCuL8kfLD1hk8LS1Pmn/1q+byJyYODAzWHhHQ6Hj + lrv/tXeyrQzva84u+kK5eBvrQ61cc0GknACa9E4iRO05BMn4mNb8CgY8/8UzMItw + lyHkA4MguI2l3qO98PBYqhT06+CQC7ZsbtDJdfkBCBMrGWfpSXgfV/moJQWR3nO9 + iSr1Rg1fLsDTSw0XDQIINcdlyArUraWFTzG5GI/ulaxgDqaZMBeD3Ms4bV54O/kU + sjwKEJKjy8jfiDorrPw4uIfC7yq+NbPZoPEzJQIDAQABAoIBAQCIo2wOKIAytiKy + AAkKNTxEA7sfOzd+AnH0AAjpsWlruCXly9QKmRpTox7KcATTjvt2EuLHIDHkMLm/ + oUFATIR2RpO7pBfGIoBPR+0PgF9Trm8BaNcL4c7QFum2aIadapmrw6TXt7Tb5rLK + C6ty7vk7Fzb0LJ9yt650V7hPqMfiimPXaEK5ar9AdONdsCdozBzvLGse4kfcUuLA + rpIWe5UasbInqv1Gnan7yry6DogQOON0WYtXb6VWmINGW04l0Cr68YhrB9N9XRIG + QpjFdnoL8tJ7bc6PISnHh14J2xIrN95DguZBDM0VDSyv/LhP8e4GSfOezLqVr1KG + kbf3T+V1AoGBAOfSSSwLPJKPegbnwrwh4KNUt3J1x3RJAtniNYZ3T69aO3jC4Z7q + 0ZKZE6Nwhb6pogaqi1cizeGzSxbFNmYGHLuL/DkkBKYcha1KMJwliZ5R45SLS63Y + DTyRcqEJ1Hu3fJa/Onst87c5fPfs//4WrGPXy3XdIfzQnxuP0FHQ7A5zAoGBAOB3 + RjZthPUoQqc4j5yvUwHQOlmqXdyYpWi9bh/jxbg+vZ1SNYu7JGCSHQqjjnec17M4 + ntdkrbFQp5+EyOWnRPiu0Mg6Be54VBiIrAhxSs6t+8Fi4dORfT/FMV+Q1b4b9mhx + kzMEqyqiokGlTnjO7ZXbjDm8/KtqbkcBMEK1fnoHAoGAFHopxn8zmYqc79E3DWE8 + s5C/J5gpxybP3qkxqzAM1ON2j2M/hMcfPgDRkEVXOxFG46na5xaG8yHgRyGifX6a + uSJTZES/OGEamcUM6C4Uqux22t83DyMfgDMk2f7BSzBZDAPWSZ00gwHL/SZtMmeU + ULl2GnIvF2LiOxAICcIXp+sCgYEAlGcnO5ri+bbZgndJs5zSs3M48MlLbypYycvc + ACd2NF7+vAF7N1vOLC7OFpeV/Izsqyg3FE8S6xVZDYUb0YHqfsQNcyOxgj151BKg + MqC8hbLPrMa0aU1aUowMHZPDTQJtwhW87VEb3X9S6TXikMq2l4pkxlOldatTJ4yo + nKIj8YcCgYA7WQEKryuZ2XPbdgVxP53diBrA7nmBoAos0T6c6BiAdMjy0M/G6Mm0 + 8DQzqT/bEvqADKsabFu341euma7UOWFnf8MM1uWGp1PiDf0B6mO6z3kbE0XW1QpF + 2Y7b3faqSiFnbeaDtPUl+aAFB00uvc3NyRSB1cKghScWw3REjlqMRg== + -----END RSA PRIVATE KEY----- + ', + $nova_ssh_public_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLRAJbVtijWMsOuSpGnaoiLgdxjZlOEb8PTNHgjZ5ZKQRdGdcX9w56szwEtigI5rYEBe6dIgRoK4vyR8sPWGTwtLU+af/Wr5vInJg4MDNYeEdDoeOWu/+1d7KtDO9rzi76Qrl4G+tDrVxzQaScAJr0TiJE7TkEyfiY1vwKBjz/xTMwi3CXIeQDgyC4jaXeo73w8FiqFPTr4JALtmxu0Ml1+QEIEysZZ+lJeB9X+aglBZHec72JKvVGDV8uwNNLDRcNAgg1x2XICtStpYVPMbkYj+6VrGAOppkwF4PcyzhtXng7+RSyPAoQkqPLyN+IOius/Di4h8LvKr41s9mg8TMl nova@openstack', + $spice_port = 6082, + $cinder_rbd_user = 'cinder', + $nova_rbd_pool = 'volumes', + $nova_rbd_secret_uuid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', $has_ceph = false ) { From 0b916cace373048cb8be6493eda8ad6809c4c331 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 12:08:25 -0500 Subject: [PATCH 12/20] Set default parameters for volume.pp volume/controller.pp and volume/storage.pp Related #1 --- manifests/volume.pp | 22 +++++++++++----------- manifests/volume/controller.pp | 12 ++++++------ manifests/volume/storage.pp | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index abfc5b44..15c65c25 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -65,17 +65,17 @@ # Defaults value in params # class cloud::volume( - $cinder_db_host = $os_params::cinder_db_host, - $cinder_db_user = $os_params::cinder_db_user, - $cinder_db_password = $os_params::cinder_db_password, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_cinder_password = $os_params::ks_cinder_password, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $log_facility = $os_params::log_facility, - $use_syslog = $os_params::use_syslog + $cinder_db_host = '127.0.0.1', + $cinder_db_user = 'cinder', + $cinder_db_password = 'cinderpassword', + $rabbit_hosts = ['127.0.0.1:5672'], + $rabbit_password = 'rabbitpassword', + $ks_keystone_internal_host = '127.0.0.1', + $ks_cinder_password = 'cinderpassword', + $verbose = true, + $debug = true, + $log_facility = 'LOG_LOCAL0', + $use_syslog = true ) { # Disable twice logging if syslog is enabled diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index a428b3bd..0cdb2ec7 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -17,12 +17,12 @@ # class cloud::volume::controller( - $ks_cinder_internal_port = $os_params::ks_cinder_internal_port, - $ks_cinder_password = $os_params::ks_cinder_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_glance_internal_host = $os_params::ks_glance_internal_host, - $ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port, - $api_eth = $os_params::api_eth, + $ks_cinder_internal_port = 8776, + $ks_cinder_password = 'cinderpassword', + $ks_keystone_internal_host = '127.0.0.1', + $ks_glance_internal_host = '127.0.0.1', + $ks_glance_api_internal_port = 9292, + $api_eth = '127.0.0.1', # Maintain backward compatibility for multi-backend $volume_multi_backend = false, $default_volume_type = undef, diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index fd2431a7..60a9074b 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -55,14 +55,14 @@ class cloud::volume::storage( $ks_keystone_internal_port = '5000', $ks_keystone_internal_host = '127.0.0.1', $ks_cinder_password = 'secrete', - # Deprecated parameters - $glance_api_version = '2', - $cinder_rbd_pool = $os_params::cinder_rbd_pool, - $cinder_rbd_user = $os_params::cinder_rbd_user, - $cinder_rbd_secret_uuid = $os_params::ceph_fsid, + $cinder_rbd_pool = 'volumes', + $cinder_rbd_user = 'cinder', + $cinder_rbd_secret_uuid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', $cinder_rbd_conf = '/etc/ceph/ceph.conf', $cinder_rbd_flatten_volume_from_snapshot = false, - $cinder_rbd_max_clone_depth = '5' + $cinder_rbd_max_clone_depth = '5', + # Deprecated parameters + $glance_api_version = '2', ) { include 'cloud::volume' From 82265d36f3ced989124dea1551906f1dd8167822 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 12:18:13 -0500 Subject: [PATCH 13/20] 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', From 74187a829be2aae2d3c10ede865cc4f405c5aeca Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 13:53:23 -0500 Subject: [PATCH 14/20] Set default parameters for storage/*.pp Related #1 --- manifests/storage/rbd.pp | 6 +++--- manifests/storage/rbd/monitor.pp | 4 ++-- manifests/storage/rbd/osd.pp | 4 ++-- manifests/storage/rbd/pools.pp | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/storage/rbd.pp b/manifests/storage/rbd.pp index 1b37e27a..a0853dd8 100644 --- a/manifests/storage/rbd.pp +++ b/manifests/storage/rbd.pp @@ -15,9 +15,9 @@ # class cloud::storage::rbd ( - $fsid = $os_params::ceph_fsid, - $cluster_network = $os_params::ceph_cluster_network, - $public_network = $os_params::ceph_public_network + $fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', + $cluster_network = '127.0.0.1/24', + $public_network = '127.0.0.1/24' ) { class { 'ceph::conf': diff --git a/manifests/storage/rbd/monitor.pp b/manifests/storage/rbd/monitor.pp index 57e8f8a0..e6a950be 100644 --- a/manifests/storage/rbd/monitor.pp +++ b/manifests/storage/rbd/monitor.pp @@ -16,8 +16,8 @@ class cloud::storage::rbd::monitor ( $id = $::uniqueid, - $mon_addr = $os_params::internal_netif_ip, - $monitor_secret = $os_params::ceph_mon_secret + $mon_addr = '127.0.0.1', + $monitor_secret = 'cephmonsecret' ) { include 'cloud::storage::rbd' diff --git a/manifests/storage/rbd/osd.pp b/manifests/storage/rbd/osd.pp index 7f668d92..e85608cc 100644 --- a/manifests/storage/rbd/osd.pp +++ b/manifests/storage/rbd/osd.pp @@ -14,8 +14,8 @@ # under the License. # class cloud::storage::rbd::osd ( - $public_address = $os_params::api_eth, - $cluster_address = $os_params::storage_eth, + $public_address = '127.0.0.1', + $cluster_address = '127.0.0.1', $devices = ['sdb','sdc'], ) { diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 37c74a0b..640be556 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -15,14 +15,14 @@ # class cloud::storage::rbd::pools( $setup_pools = false, - $glance_rbd_user = $os_params::glance_rbd_user, - $glance_rbd_pool = $os_params::glance_rbd_pool, - $cinder_rbd_user = $os_params::cinder_rbd_user, - $cinder_rbd_pool = $os_params::cinder_rbd_pool, - $nova_rbd_pool = $os_params::nova_rbd_pool, - $cinder_backup_user = $os_params::cinder_rbd_backup_user, - $cinder_backup_pool = $os_params::cinder_rbd_backup_pool, - $ceph_fsid = $os_params::ceph_fsid, + $glance_rbd_user = 'glance', + $glance_rbd_pool = 'images', + $cinder_rbd_user = 'cinder', + $cinder_rbd_pool = 'volumes', + $nova_rbd_pool = 'vms', + $cinder_backup_user = 'cinder', + $cinder_backup_pool = 'cinder_backup', + $ceph_fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45' ) { if $setup_pools { From 2aaba1b83ac9f6ebd33bc0176961501166e92e3e Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 14:14:28 -0500 Subject: [PATCH 15/20] Set default parameters for network.pp network/*.pp Related #1 --- manifests/network.pp | 22 +++++++++++----------- manifests/network/controller.pp | 20 ++++++++++---------- manifests/network/dhcp.pp | 4 ++-- manifests/network/l3.pp | 4 ++-- manifests/network/lbaas.pp | 2 +- manifests/network/metadata.pp | 16 ++++++++-------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/manifests/network.pp b/manifests/network.pp index 8524f10d..4e2fd949 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -60,17 +60,17 @@ # Defauls to '120' class cloud::network( - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $tunnel_eth = $os_params::tunnel_eth, - $api_eth = $os_params::api_eth, - $provider_vlan_ranges = $os_params::provider_vlan_ranges, - $provider_bridge_mappings = $os_params::provider_bridge_mappings, - $use_syslog = $os_params::use_syslog, - $log_facility = $os_params::log_facility, - $dhcp_lease_duration = '120', + $verbose = true, + $debug = true, + $rabbit_hosts = ['127.0.0.1:5672'], + $rabbit_password = 'rabbitpassword', + $tunnel_eth = '127.0.0.1', + $api_eth = '127.0.0.1', + $provider_vlan_ranges = ['physnet1:1000:2999'], + $provider_bridge_mappings = ['physnet1:br-eth1'], + $use_syslog = true, + $log_facility = 'LOG_LOCAL0', + $dhcp_lease_duration = '120' ) { # Disable twice logging if syslog is enabled diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index 0354b72e..f3d02cc5 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -17,16 +17,16 @@ # class cloud::network::controller( - $neutron_db_host = $os_params::neutron_db_host, - $neutron_db_user = $os_params::neutron_db_user, - $neutron_db_password = $os_params::neutron_db_password, - $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, - $ks_neutron_public_port = $os_params::ks_neutron_public_port, - $api_eth = $os_params::api_eth, - $ks_admin_tenant = $os_params::ks_admin_tenant, - $public_cidr = $os_params::public_cidr + $neutron_db_host = '127.0.0.1', + $neutron_db_user = 'neutron', + $neutron_db_password = 'neutronpassword', + $ks_neutron_password = 'neutronpassword', + $ks_keystone_admin_host = '127.0.0.1', + $ks_keystone_public_port = 5000, + $ks_neutron_public_port = 9696, + $api_eth = '127.0.0.1', + $ks_admin_tenant = 'admin', + $public_cidr = '173.24.4.224/28' ) { include 'cloud::network' diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp index 4b947a4a..152de037 100644 --- a/manifests/network/dhcp.pp +++ b/manifests/network/dhcp.pp @@ -17,8 +17,8 @@ # class cloud::network::dhcp( - $veth_mtu = $os_params::veth_mtu, - $debug = $os_params::debug + $veth_mtu = 1500, + $debug = true ) { include 'cloud::network' diff --git a/manifests/network/l3.pp b/manifests/network/l3.pp index 1e51bf68..92a58506 100644 --- a/manifests/network/l3.pp +++ b/manifests/network/l3.pp @@ -17,8 +17,8 @@ # class cloud::network::l3( - $external_int = $os_params::external_int, - $debug = $os_params::debug, + $external_int = 'eth0', + $debug = true, ) { include 'cloud::network' diff --git a/manifests/network/lbaas.pp b/manifests/network/lbaas.pp index 8ef0505e..5c8f82e0 100644 --- a/manifests/network/lbaas.pp +++ b/manifests/network/lbaas.pp @@ -17,7 +17,7 @@ # class cloud::network::lbaas( - $debug = $os_params::debug, + $debug = true, $manage_haproxy_pkg = true ) { diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index 7d17a725..16051e02 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -19,14 +19,14 @@ class cloud::network::metadata( $enabled = true, - $debug = $os_params::debug, - $ks_neutron_password = $os_params::ks_neutron_password, - $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, - $nova_metadata_server = $os_params::vip_internal_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, - $auth_region = $os_params::region + $debug = true, + $ks_neutron_password = 'neutronpassword', + $neutron_metadata_proxy_shared_secret = 'asecreteaboutneutron', + $nova_metadata_server = '127.0.0.1', + $ks_keystone_admin_proto = 'http', + $ks_keystone_admin_port = 35357, + $ks_keystone_admin_host = '127.0.0.1', + $auth_region = 'planet42', ) { include 'cloud::network' From 57c387d48d9ea1c8c9342e3b77d75768dfabda2a Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 14:30:00 -0500 Subject: [PATCH 16/20] Set default parameters for init.pp Related #1 --- manifests/init.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4076401a..908d7ac6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,20 +50,20 @@ This node is under the control of Puppet ${::puppetversion}. # DNS class { 'dnsclient': - nameservers => $os_params::dns_ips, + nameservers => ['8.8.8.8'], options => 'UNSET', - search => $os_params::site_domain, - domain => $os_params::site_domain, + search => 'example.com', + domain => 'example.com', } # NTP - class { 'ntp': servers => $::os_params::ntp_servers } + class { 'ntp': servers => undef } # Strong root password for all servers user { 'root': ensure => 'present', gid => '0', - password => $os_params::root_password, + password => 'root', uid => '0', } From 4c5e65ca61caffa2242a915320422cb9cf74402b Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 18 Mar 2014 23:06:25 -0400 Subject: [PATCH 17/20] Apply undef default for sensitive data Apply undef value as default value for sensitive data like token, secret_uuid, etc... related #1 --- manifests/compute/hypervisor.pp | 34 +++------------------------------ manifests/identity.pp | 2 +- manifests/object.pp | 2 +- manifests/storage/rbd.pp | 2 +- manifests/storage/rbd/pools.pp | 2 +- manifests/volume/storage.pp | 2 +- 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index ba6bf83f..7fa488df 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -31,40 +31,12 @@ class cloud::compute::hypervisor( $libvirt_type = 'kvm', $ks_nova_public_proto = 'http', $ks_nova_public_host = '127.0.0.1', - $nova_ssh_private_key = ' - -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEAy0QCW1bYo1jLDrkqRp2qIi4HcY2ZThG/D0zR4I2eWSkEXRnX - F/cOerM8BLYoCOa2BAXunSIEaCuL8kfLD1hk8LS1Pmn/1q+byJyYODAzWHhHQ6Hj - lrv/tXeyrQzva84u+kK5eBvrQ61cc0GknACa9E4iRO05BMn4mNb8CgY8/8UzMItw - lyHkA4MguI2l3qO98PBYqhT06+CQC7ZsbtDJdfkBCBMrGWfpSXgfV/moJQWR3nO9 - iSr1Rg1fLsDTSw0XDQIINcdlyArUraWFTzG5GI/ulaxgDqaZMBeD3Ms4bV54O/kU - sjwKEJKjy8jfiDorrPw4uIfC7yq+NbPZoPEzJQIDAQABAoIBAQCIo2wOKIAytiKy - AAkKNTxEA7sfOzd+AnH0AAjpsWlruCXly9QKmRpTox7KcATTjvt2EuLHIDHkMLm/ - oUFATIR2RpO7pBfGIoBPR+0PgF9Trm8BaNcL4c7QFum2aIadapmrw6TXt7Tb5rLK - C6ty7vk7Fzb0LJ9yt650V7hPqMfiimPXaEK5ar9AdONdsCdozBzvLGse4kfcUuLA - rpIWe5UasbInqv1Gnan7yry6DogQOON0WYtXb6VWmINGW04l0Cr68YhrB9N9XRIG - QpjFdnoL8tJ7bc6PISnHh14J2xIrN95DguZBDM0VDSyv/LhP8e4GSfOezLqVr1KG - kbf3T+V1AoGBAOfSSSwLPJKPegbnwrwh4KNUt3J1x3RJAtniNYZ3T69aO3jC4Z7q - 0ZKZE6Nwhb6pogaqi1cizeGzSxbFNmYGHLuL/DkkBKYcha1KMJwliZ5R45SLS63Y - DTyRcqEJ1Hu3fJa/Onst87c5fPfs//4WrGPXy3XdIfzQnxuP0FHQ7A5zAoGBAOB3 - RjZthPUoQqc4j5yvUwHQOlmqXdyYpWi9bh/jxbg+vZ1SNYu7JGCSHQqjjnec17M4 - ntdkrbFQp5+EyOWnRPiu0Mg6Be54VBiIrAhxSs6t+8Fi4dORfT/FMV+Q1b4b9mhx - kzMEqyqiokGlTnjO7ZXbjDm8/KtqbkcBMEK1fnoHAoGAFHopxn8zmYqc79E3DWE8 - s5C/J5gpxybP3qkxqzAM1ON2j2M/hMcfPgDRkEVXOxFG46na5xaG8yHgRyGifX6a - uSJTZES/OGEamcUM6C4Uqux22t83DyMfgDMk2f7BSzBZDAPWSZ00gwHL/SZtMmeU - ULl2GnIvF2LiOxAICcIXp+sCgYEAlGcnO5ri+bbZgndJs5zSs3M48MlLbypYycvc - ACd2NF7+vAF7N1vOLC7OFpeV/Izsqyg3FE8S6xVZDYUb0YHqfsQNcyOxgj151BKg - MqC8hbLPrMa0aU1aUowMHZPDTQJtwhW87VEb3X9S6TXikMq2l4pkxlOldatTJ4yo - nKIj8YcCgYA7WQEKryuZ2XPbdgVxP53diBrA7nmBoAos0T6c6BiAdMjy0M/G6Mm0 - 8DQzqT/bEvqADKsabFu341euma7UOWFnf8MM1uWGp1PiDf0B6mO6z3kbE0XW1QpF - 2Y7b3faqSiFnbeaDtPUl+aAFB00uvc3NyRSB1cKghScWw3REjlqMRg== - -----END RSA PRIVATE KEY----- - ', - $nova_ssh_public_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLRAJbVtijWMsOuSpGnaoiLgdxjZlOEb8PTNHgjZ5ZKQRdGdcX9w56szwEtigI5rYEBe6dIgRoK4vyR8sPWGTwtLU+af/Wr5vInJg4MDNYeEdDoeOWu/+1d7KtDO9rzi76Qrl4G+tDrVxzQaScAJr0TiJE7TkEyfiY1vwKBjz/xTMwi3CXIeQDgyC4jaXeo73w8FiqFPTr4JALtmxu0Ml1+QEIEysZZ+lJeB9X+aglBZHec72JKvVGDV8uwNNLDRcNAgg1x2XICtStpYVPMbkYj+6VrGAOppkwF4PcyzhtXng7+RSyPAoQkqPLyN+IOius/Di4h8LvKr41s9mg8TMl nova@openstack', + $nova_ssh_private_key = undef, + $nova_ssh_public_key = undef, $spice_port = 6082, $cinder_rbd_user = 'cinder', $nova_rbd_pool = 'volumes', - $nova_rbd_secret_uuid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', + $nova_rbd_secret_uuid = undef, $has_ceph = false ) { diff --git a/manifests/identity.pp b/manifests/identity.pp index 01cd0789..5cef40b0 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -337,7 +337,7 @@ class cloud::identity ( $ks_admin_email = 'no-reply@keystone.openstack', $ks_admin_password = 'adminpassword', $ks_admin_tenant = 'admin', - $ks_admin_token = 'iw3feche3JeeYo9mejoohaugai3thohahwo9tiuyoe5Thier8Eiwah8K', + $ks_admin_token = undef, $ks_ceilometer_admin_host = '127.0.0.1', $ks_ceilometer_internal_host = '127.0.0.1', $ks_ceilometer_password = 'ceilometerpassword', diff --git a/manifests/object.pp b/manifests/object.pp index d7fac1d5..00b94409 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -25,7 +25,7 @@ # class cloud::object( - $swift_hash_suffix = 'ni2aseiWi8ich3oo' + $swift_hash_suffix = undef ) { class { 'ssh::server::install': } diff --git a/manifests/storage/rbd.pp b/manifests/storage/rbd.pp index a0853dd8..d1e25614 100644 --- a/manifests/storage/rbd.pp +++ b/manifests/storage/rbd.pp @@ -15,7 +15,7 @@ # class cloud::storage::rbd ( - $fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', + $fsid = undef, $cluster_network = '127.0.0.1/24', $public_network = '127.0.0.1/24' ) { diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 640be556..e444c08a 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -22,7 +22,7 @@ class cloud::storage::rbd::pools( $nova_rbd_pool = 'vms', $cinder_backup_user = 'cinder', $cinder_backup_pool = 'cinder_backup', - $ceph_fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45' + $ceph_fsid = undef ) { if $setup_pools { diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index 60a9074b..26d3b60b 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -57,7 +57,7 @@ class cloud::volume::storage( $ks_cinder_password = 'secrete', $cinder_rbd_pool = 'volumes', $cinder_rbd_user = 'cinder', - $cinder_rbd_secret_uuid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', + $cinder_rbd_secret_uuid = undef, $cinder_rbd_conf = '/etc/ceph/ceph.conf', $cinder_rbd_flatten_volume_from_snapshot = false, $cinder_rbd_max_clone_depth = '5', From 4213f69b976c8aa3a83c088589d9a6da393af198 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 22 Apr 2014 16:24:54 +0200 Subject: [PATCH 18/20] identity: fix token driver param --- manifests/identity.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index 5cef40b0..4b2a7a25 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -397,7 +397,7 @@ class cloud::identity ( $log_facility = 'LOG_LOCAL0', $use_syslog = true, $ks_token_expiration = 3600, - $ks_token_driver = 'keystone.token.backends.sql.Token' + $token_driver = 'keystone.token.backends.sql.Token' ){ $encoded_user = uriescape($keystone_db_user) From 6692602d72ed00172ef5b593a64421d1730301ee Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 22 Apr 2014 19:15:50 +0200 Subject: [PATCH 19/20] Defaults values: cleanup manifest documentation Cleanup puppet-doc support. --- manifests/cache.pp | 2 +- manifests/compute.pp | 28 +++--- manifests/dashboard.pp | 16 ++-- manifests/database/nosql.pp | 15 ++-- manifests/database/sql.pp | 4 +- manifests/identity.pp | 160 ++++++++++++++++----------------- manifests/image.pp | 31 +++---- manifests/init.pp | 2 +- manifests/messaging.pp | 13 +-- manifests/network.pp | 19 ++-- manifests/network/metadata.pp | 2 +- manifests/object.pp | 3 +- manifests/orchestration.pp | 37 ++++---- manifests/spof.pp | 4 +- manifests/telemetry.pp | 26 +++--- manifests/volume.pp | 23 ++--- manifests/volume/controller.pp | 4 +- 17 files changed, 195 insertions(+), 194 deletions(-) diff --git a/manifests/cache.pp b/manifests/cache.pp index e4ff37fe..2c500dce 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -21,7 +21,7 @@ # # [*listen_ip*] # (optional) IP address on which memcached instance should listen -# Default in params. +# Defaults to '127.0.0.1' # class cloud::cache ( diff --git a/manifests/compute.pp b/manifests/compute.pp index c9b6130b..1a7e63d3 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -21,51 +21,51 @@ # # [*nova_db_host*] # (optional) Hostname or IP address to connect to nova database -# Default value in params +# Defaults to '127.0.0.1' # # [*nova_db_user*] # (optional) Username to connect to nova database -# Default value in params +# Defaults to 'nova' # # [*nova_db_password*] # (optional) Password to connect to nova database -# Default value in params +# Defaults to 'novapassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_glance_internal_host*] # (optional) Internal Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*glance_api_port*] # (optional) TCP port to connect to Glance API -# Default value in params +# Defaults to '9292' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*memcache_servers*] # (optionnal) Memcached servers used by Keystone. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:11211'] # class cloud::compute( @@ -83,9 +83,9 @@ class cloud::compute( $neutron_endpoint = '127.0.0.1', $neutron_protocol = 'http', $neutron_password = 'neutronpassword', - $neutron_region_name = 'planet42', + $neutron_region_name = 'RegionOne', $memcache_servers = ['127.0.0.1:11211'], - $availability_zone = 'planet42' + $availability_zone = 'RegionOne' ) { if !defined(Resource['nova_config']) { diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 28971b07..5d2c901d 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -21,20 +21,20 @@ # # [*ks_keystone_internal_host*] # (optional) Internal address for endpoint. -# Default value in params +# Defaults to '127.0.0.1' # # [*secret_key*] # (optional) Secret key. This is used by Django to provide cryptographic # signing, and should be set to a unique, unpredictable value. -# Default value in params +# Defaults to 'secrete' # # [*horizon_port*] # (optional) Port used to connect to OpenStack Dashboard -# Default value in params +# Defaults to '80' # # [*api_eth*] # (optional) Which interface we bind the Horizon server. -# Default value in params +# Defaults to '127.0.0.1' # # [*servername*] # (optional) DNS name used to connect to Openstack Dashboard. @@ -47,19 +47,19 @@ # # [*keystone_proto*] # (optional) Protocol (http or https) of keystone endpoint. -#  Defaults to params. +#  Defaults to 'http' # # [*keystone_host*] # (optional) IP / Host of keystone endpoint. -#  Defaults to params. +#  Defaults '127.0.0.1' # # [*keystone_port*] # (optional) TCP port of keystone endpoint. -#  Defaults to params. +#  Defaults to '5000' # # [*debug*] # (optional) Enable debug or not. -#  Defaults to params. +#  Defaults to true # # [*listen_ssl*] # (optional) Enable SSL support in Apache. (Defaults to false) diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index 85aedf2a..86e07c1e 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -21,7 +21,7 @@ # # [*bind_ip*] # (optional) IP address on which mongod instance should listen -# Defaults in params +# Defaults to '127.0.0.1' # # [*nojournal*] # (optional) Disable mongodb internal cache. This is not recommended for @@ -32,23 +32,24 @@ # [*replset_members*] # (optional) Ceilometer Replica set members hostnames # Should be an array. Example: ['node1', 'node2', node3'] -# Default value in params +# Defaults to hostname # class cloud::database::nosql( $bind_ip = '127.0.0.1', $nojournal = false, - $replset_members = ['mgmt001'] + $replset_members = $::hostname ) { - # bind_ip should be an array - $bind_ip_real = any2array($bind_ip) + # should be an array + $array_bind_ip = any2array($bind_ip) + $array_replset_members = any2array($replset_members) class { 'mongodb::globals': manage_package_repo => true }-> class { 'mongodb': - bind_ip => $bind_ip_real, + bind_ip => $array_bind_ip, nojournal => $nojournal, replset => 'ceilometer', } @@ -62,7 +63,7 @@ class cloud::database::nosql( } mongodb_replset{'ceilometer': - members => $replset_members, + members => $array_replset_members, before => Anchor['mongodb setup done'], } diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index 0daaaa23..c057e487 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -19,6 +19,9 @@ # # [*galera_internal_ips*] # Array of internal ip of the galera nodes. +# Defaults to ['127.0.0.1'] +# + class cloud::database::sql ( $api_eth = '127.0.0.1', $service_provider = 'sysv', @@ -65,7 +68,6 @@ class cloud::database::sql ( $mysql_service_name = 'mysql' } - # TODO(Gonéri): OS/values detection should be moved in a params.pp case $::osfamily { 'RedHat': { class { 'mysql': diff --git a/manifests/identity.pp b/manifests/identity.pp index 4b2a7a25..20c6773e 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -21,303 +21,294 @@ # # [*identity_roles_addons*] # (optional) Extra keystone roles to create -# Default value in params +# Defaults to ['SwiftOperator', 'ResellerAdmin'] # # [*keystone_db_host*] # (optional) Hostname or IP address to connect to keystone database -# Default value in params +# Defaults to '127.0.0.1' # # [*keystone_db_user*] # (optional) Username to connect to keystone database -# Default value in params +# Defaults to 'keystone' # # [*keystone_db_password*] # (optional) Password to connect to keystone database -# Default value in params +# Defaults to 'keystonepassword' # # [*ks_admin_email*] # (optional) Email address of admin user in Keystone -# Default value in params +# Defaults to 'no-reply@keystone.openstack' # # [*ks_admin_password*] # (optional) Password of admin user in Keystone -# Default value in params +# Defaults to 'adminpassword' # # [*ks_admin_tenant*] # (optional) Admin tenant name in Keystone -# Default value in params +# Defaults to 'admin' # # [*ks_admin_token*] -# (optional) Admin token used by Keystone. -# Default value in params +# (required) Admin token used by Keystone. # # [*ks_glance_internal_host*] # (optional) Internal Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_glance_admin_host*] # (optional) Admin Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_glance_public_host*] # (optional) Public Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_internal_host*] # (optional) Internal Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_admin_host*] # (optional) Admin Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_public_host*] # (optional) Public Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_public_host*] # (optional) Public Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_internal_host*] # (optional) Internal Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_admin_host*] # (optional) Admin Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_public_host*] # (optional) Public Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_internal_host*] # (optional) Internal Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_admin_host*] # (optional) Admin Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_public_host*] # (optional) Public Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_internal_host*] # (optional) Internal Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_admin_host*] # (optional) Admin Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_public_host*] # (optional) Public Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_internal_host*] # (optional) Internal Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_admin_host*] # (optional) Admin Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_public_host*] # (optional) Public Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_internal_host*] # (optional) Internal Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_admin_host*] # (optional) Admin Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_public_host*] # (optional) Public Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_password*] # (optional) Password used by Ceilometer to connect to Keystone API -# Default value in params +# Defaults to 'ceilometerpassword' # # [*ks_swift_password*] # (optional) Password used by Swift to connect to Keystone API -# Default value in params +# Defaults to 'swiftpassword' # # [*ks_nova_password*] # (optional) Password used by Nova to connect to Keystone API -# Default value in params +# Defaults to 'novapassword' # # [*ks_neutron_password*] # (optional) Password used by Neutron to connect to Keystone API -# Default value in params +# Defaults to 'neutronpassword' # # [*ks_heat_password*] # (optional) Password used by Heat to connect to Keystone API -# Default value in params +# Defaults to 'heatpassword' # # [*ks_glance_password*] # (optional) Password used by Glance to connect to Keystone API -# Default value in params +# Defaults to 'glancepassword' # # [*ks_cinder_password*] # (optional) Password used by Cinder to connect to Keystone API -# Default value in params +# Defaults to 'cinderpassword' # # [*ks_swift_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_ceilometer_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_nova_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_neutron_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_glance_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_cinder_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_ceilometer_public_port*] # (optional) TCP port to connect to Ceilometer API from public network -# Default value in params +# Defaults to '8777' # # [*ks_ceilometer_admin_port*] # (optional) TCP port to connect to Ceilometer API from admin network -# Default value in params +# Defaults to '8777' # # [*ks_ceilometer_internal_port*] # (optional) TCP port to connect to Ceilometer API from internal network -# Default value in params +# Defaults to '8777' # # [*ks_keystone_internal_port*] # (optional) TCP port to connect to Keystone API from internal network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_public_port*] # (optional) TCP port to connect to Keystone API from public network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_admin_port*] # (optional) TCP port to connect to Keystone API from admin network -# Default value in params +# Defaults to '35357' # # [*ks_swift_public_port*] # (optional) TCP port to connect to Swift API from public network -# Default value in params +# Defaults to '8080' # # [*ks_nova_internal_port*] # (optional) TCP port to connect to Nova API from internal network -# Default value in params +# Defaults to '8774' # # [*ks_nova_public_port*] # (optional) TCP port to connect to Nova API from public network -# Default value in params +# Defaults to '8774' # # [*ks_ec2_public_port*] # (optional) TCP port to connect to EC2 API from public network -# Default value in params +# Defaults to '8773' # # [*ks_nova_admin_port*] # (optional) TCP port to connect to Nova API from admin network -# Default value in params +# Defaults to '8774' # # [*ks_cinder_internal_port*] # (optional) TCP port to connect to Cinder API from internal network -# Default value in params +# Defaults to '8776' # # [*ks_cinder_public_port*] # (optional) TCP port to connect to Cinder API from public network -# Default value in params +# Defaults to '8776' # # [*ks_cinder_admin_port*] # (optional) TCP port to connect to Cinder API from admin network -# Default value in params +# Defaults to '8776' # # [*ks_neutron_internal_port*] # (optional) TCP port to connect to Neutron API from internal network -# Default value in params +# Defaults to '9696' # # [*ks_neutron_public_port*] # (optional) TCP port to connect to Neutron API from public network -# Default value in params +# Defaults to '9696' # # [*ks_neutron_admin_port*] # (optional) TCP port to connect to Neutron API from admin network -# Default value in params -# -# [*ks_heat_internal_port*] -# (optional) TCP port to connect to Heat API from internal network -# Default value in params +# Defaults to '9696' # # [*ks_heat_public_port*] # (optional) TCP port to connect to Heat API from public network -# Default value in params -# -# [*ks_heat_admin_port*] -# (optional) TCP port to connect to Heat API from admin network -# Default value in params +# Defaults to '8000' # # [*ks_glance_api_internal_port*] # (optional) TCP port to connect to Glance API from internal network -# Default value in params +# Defaults to '9292' # # [*ks_glance_api_public_port*] # (optional) TCP port to connect to Glance API from public network -# Default value in params +# Defaults to '9292' # # [*ks_glance_api_admin_port*] # (optional) TCP port to connect to Glance API from admin network -# Default value in params +# Defaults to '9292' # # [*api_eth*] # (optional) Which interface we bind the Keystone server. -# Default value in params +# Defaults to '127.0.0.1' # # [*region*] # (optional) OpenStack Region Name -# Default value in params +# Defaults to 'RegionOne' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*token_driver*] # (optional) Driver to store tokens @@ -325,8 +316,9 @@ # # [*token_expiration*] # (optional) Amount of time a token should remain valid (in seconds) -# Defaults value in params +# Defaults to '3600' (1 hour) # + class cloud::identity ( $swift_enabled = true, $identity_roles_addons = ['SwiftOperator', 'ResellerAdmin'], @@ -391,7 +383,7 @@ class cloud::identity ( $ks_swift_public_port = 8080, $ks_swift_public_proto = 'http', $api_eth = '127.0.0.1', - $region = 'planet42', + $region = 'RegionOne', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/image.pp b/manifests/image.pp index ca32af44..a37aa57a 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -21,52 +21,53 @@ # # [*glance_db_host*] # (optional) Hostname or IP address to connect to glance database -# Default value in params +# Defaults to '127.0.0.1' # # [*glance_db_user*] # (optional) Username to connect to glance database -# Default value in params +# Defaults to 'glance' # # [*glance_db_password*] # (optional) Password to connect to glance database -# Default value in params +# Defaults to 'glancepassword' # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_glance_api_internal_port*] # (optional) TCP port to connect to Glance API from internal network -# Default value in params +# Defaults to '9292' # # [*ks_glance_registry_internal_port*] # (optional) TCP port to connect to Glance Registry from internal network -# Default value in params +# Defaults to '9191' # # [*ks_glance_password*] # (optional) Password used by Glance to connect to Keystone API -# Default value in params +# Defaults to 'glancepassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to '127.0.0.1' # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*api_eth*] # (optional) Which interface we bind the Glance API server. -# Default value in params +# Defaults to '127.0.0.1' # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::image( $glance_db_host = '127.0.0.1', $glance_db_user = 'glance', @@ -79,9 +80,9 @@ class cloud::image( $rabbit_password = 'rabbitpassword', $rabbit_host = '127.0.0.1', $api_eth = '127.0.0.1', - $openstack_vip = '127.0.0.2', - $glance_rbd_pool = 'images', - $glance_rbd_user = 'glance', + $openstack_vip = undef, + $glance_rbd_pool = 'images', + $glance_rbd_user = 'glance', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/init.pp b/manifests/init.pp index 908d7ac6..2a7fcd66 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -19,7 +19,7 @@ # class cloud( - $rhn_registration = $os_params::rhn_registration, + $rhn_registration = undef, ) { if ! ($::osfamily in [ 'RedHat', 'Debian' ]) { diff --git a/manifests/messaging.pp b/manifests/messaging.pp index 89d91839..db1a21d9 100644 --- a/manifests/messaging.pp +++ b/manifests/messaging.pp @@ -21,11 +21,11 @@ # # [*rabbit_names*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to $::hostname # # [*rabbit_password*] # (optional) Password to connect to OpenStack queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*cluster_node_type*] # (optionnal) Store the queues on the disc or in the RAM. @@ -34,10 +34,13 @@ class cloud::messaging( $cluster_node_type = 'disc', - $rabbit_names = ['mgmt001'], - $rabbit_password = 'rabbitpassword' + $rabbit_names = $::hostname, + $rabbit_password = 'rabbitpassword' ){ + # we ensure having an array + $array_rabbit_names = any2array($rabbit_names) + # Packaging issue: https://bugzilla.redhat.com/show_bug.cgi?id=1033305 if $::osfamily == 'RedHat' { file {'/usr/sbin/rabbitmq-plugins': @@ -54,7 +57,7 @@ class cloud::messaging( class { 'rabbitmq': delete_guest_user => true, config_cluster => true, - cluster_nodes => $rabbit_names, + cluster_nodes => $array_rabbit_names, wipe_db_on_cookie_change => true, cluster_node_type => $cluster_node_type } diff --git a/manifests/network.pp b/manifests/network.pp index 4e2fd949..f4c5b381 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -21,43 +21,44 @@ # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*tunnel_eth*] # (optional) Which interface we connect to create overlay tunnels. -# Default value in params +# Defaults to '127.0.0.1' # # [*provider_vlan_ranges*] # (optionnal) VLAN range for provider networks -# Default value in params +# Defaults to ['physnet1:1000:2999'] # # [*provider_bridge_mappings*] # (optionnal) Bridge mapping for provider networks -# Default value in params +# Defaults to ['physnet1:br-eth1'] # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*dhcp_lease_duration*] # (optionnal) DHCP Lease duration (in seconds) # Defauls to '120' +# class cloud::network( $verbose = true, diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index 16051e02..4baf5761 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -26,7 +26,7 @@ class cloud::network::metadata( $ks_keystone_admin_proto = 'http', $ks_keystone_admin_port = 35357, $ks_keystone_admin_host = '127.0.0.1', - $auth_region = 'planet42', + $auth_region = 'RegionOne', ) { include 'cloud::network' diff --git a/manifests/object.pp b/manifests/object.pp index 00b94409..84dd7e36 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -20,8 +20,7 @@ # === Parameters: # # [*swift_hash_suffix*] -# (optional) String of text to be used as a salt when hashing to determine mappings in the ring. -# Default value in params +# (required) String of text to be used as a salt when hashing to determine mappings in the ring. # class cloud::object( diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index 140aad5d..7d91cb4f 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -21,76 +21,77 @@ # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_internal_port*] # (optional) TCP port to connect to Keystone API from internal network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_admin_port*] # (optional) TCP port to connect to Keystone API from admin network -# Default value in params +# Defaults to '35357' # # [*ks_keystone_internal_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_keystone_admin_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_public_host*] # (optional) Public Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_password*] # (optional) Password used by Heat to connect to Keystone API -# Default value in params +# Defaults to 'heatpassword' # # [*heat_db_host*] # (optional) Hostname or IP address to connect to heat database -# Default value in params +# Defaults to '127.0.0.1' # # [*heat_db_user*] # (optional) Username to connect to heat database -# Default value in params +# Defaults to 'heat' # # [*heat_db_password*] # (optional) Password to connect to heat database -# Default value in params +# Defaults to 'heatpassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to heat queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::orchestration( $ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_port = '5000', diff --git a/manifests/spof.pp b/manifests/spof.pp index 333ee5cb..b4102c96 100644 --- a/manifests/spof.pp +++ b/manifests/spof.pp @@ -21,11 +21,11 @@ # # [*cluster_ip*] # (optional) Interface used by Corosync to send multicast traffic -# Default to params. +# Defaults to '127.0.0.1' # # [*multicast_address*] # (optionnal) IP address used to send multicast traffic -# Default to '239.1.1.2'. +# Defaults to '239.1.1.2' # class cloud::spof( diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index c9356594..65e3faf9 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -22,51 +22,51 @@ # # [*ceilometer_secret*] # Secret key for signing messages. -# Default value in params +# Defaults to 'ceilometersecret' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_public_host*] # (optional) Public Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_password*] # (optional) Password used by Ceilometer to connect to Keystone API -# Default value in params +# Defaults to 'ceilometerpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*region*] # (optional) the keystone region of this node -# Defaults value in params +# Defaults to 'RegionOne' # class cloud::telemetry( @@ -77,7 +77,7 @@ class cloud::telemetry( $ks_keystone_internal_port = '5000', $ks_keystone_internal_proto = 'http', $ks_ceilometer_password = 'ceilometerpassword', - $region = 'planet42', + $region = 'RegionOne', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/volume.pp b/manifests/volume.pp index 15c65c25..697fb7d3 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -22,48 +22,49 @@ # # [*cinder_db_host*] # (optional) Cinder database host -# Default value in params +# Defaults to '127.0.0.1' # # [*cinder_db_user*] # (optional) Cinder database user -# Default value in params +# Defaults to 'cinder' # # [*cinder_db_password*] # (optional) Cinder database password -# Default value in params +# Defaults to 'cinderpassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to cinder queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_keystone_internal_host*] # (optional) Keystone host (authentication) -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_password*] # (optional) Keystone password for cinder user. -# Default value in params +# Defaults to 'cinderpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::volume( $cinder_db_host = '127.0.0.1', $cinder_db_user = 'cinder', diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index 0cdb2ec7..eb19ae6d 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -27,8 +27,8 @@ class cloud::volume::controller( $volume_multi_backend = false, $default_volume_type = undef, # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA - # $backup_ceph_pool = $os_params::cinder_rbd_backup_pool, - # $backup_ceph_user = $os_params::cinder_rbd_backup_user + # $backup_ceph_pool = 'backup', + # $backup_ceph_user = 'cinder' ) { include 'cloud::volume' From ce6402369f5c0ffd0cd221ab40d6898430e196d7 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 22 Apr 2014 19:31:19 +0200 Subject: [PATCH 20/20] neutron: drop useless parameter --- manifests/network/controller.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index f3d02cc5..0c4900cc 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -25,8 +25,7 @@ class cloud::network::controller( $ks_keystone_public_port = 5000, $ks_neutron_public_port = 9696, $api_eth = '127.0.0.1', - $ks_admin_tenant = 'admin', - $public_cidr = '173.24.4.224/28' + $ks_admin_tenant = 'admin' ) { include 'cloud::network'