stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Set default parameters for orchestration.pp orchestration/api.pp and orchestration/engine.pp

Browse Source 
Related #1
This commit is contained in:
Yanis Guenane
2014-02-25 10:47:57 -05:00
committed by Emilien Macchi
parent f0c36b42fa
commit a652f78d2f
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/orchestration.pp
View File

@@ -92,24 +92,24 @@
# Defaults value in params # Defaults value in params
# #
class cloud::orchestration( class cloud::orchestration(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = '5000',
$ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_keystone_internal_proto = 'http',
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = '35357',
$ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, $ks_keystone_admin_proto = 'http',
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_host = '127.0.0.1',
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_proto = 'http',
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = 'heatpassword',
$heat_db_host = $os_params::heat_db_host, $heat_db_host = '127.0.0.1',
$heat_db_user = $os_params::heat_db_user, $heat_db_user = 'heat',
$heat_db_password = $os_params::heat_db_password, $heat_db_password = 'heatpassword',
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$use_syslog = $os_params::use_syslog, $use_syslog = true,
$log_facility = $os_params::log_facility $log_facility = 'LOG_LOCAL0'
) { ) {
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

8
manifests/orchestration/api.pp
View File

@@ -17,10 +17,10 @@
# #
class cloud::orchestration::api( class cloud::orchestration::api(
$ks_heat_internal_port = $os_params::ks_heat_internal_port, $ks_heat_internal_port = 8004,
$ks_heat_cfn_internal_port = $os_params::ks_heat_cfn_internal_port, $ks_heat_cfn_internal_port = 8000,
$ks_heat_cloudwatch_internal_port = $os_params::ks_heat_cloudwatch_internal_port, $ks_heat_cloudwatch_internal_port = 8003,
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
) { ) {
include 'cloud::orchestration' include 'cloud::orchestration'

12
manifests/orchestration/engine.pp
View File

@@ -19,12 +19,12 @@
class cloud::orchestration::engine( class cloud::orchestration::engine(
$enabled = true, $enabled = true,
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_host = '127.0.0.1',
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_proto = 'http',
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = 'heatpassword',
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, $ks_heat_cfn_public_port = 8000,
$ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, $ks_heat_cloudwatch_public_port = 8003,
$auth_encryption_key = $os_params::heat_auth_encryption_key $auth_encryption_key = 'secrete'
) { ) {
include 'cloud::orchestration' include 'cloud::orchestration'