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'