stackforge/puppet-openstack-cloud
Code Issues Proposed changes

heat + ceilometer: fix variables

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-12-03 10:36:56 +01:00
parent 8af3bc92f1
commit faa01572d9
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network/network_common.pp
View File

@@ -33,7 +33,7 @@ class os_network_common(
class { 'neutron': class { 'neutron':
allow_overlapping_ips => true, allow_overlapping_ips => true,
verbose => , verbose => $verbose,
debug => $debug, debug => $debug,
rabbit_user => 'neutron', rabbit_user => 'neutron',
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,

14
roles/orchestration/orchestration_controller.pp
View File

@@ -23,12 +23,15 @@ class os_orchestration_controller(
$ks_keystone_public_host = $os_params::ks_keystone_public_host, $ks_keystone_public_host = $os_params::ks_keystone_public_host,
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_host = $os_params::ks_heat_public_host,
$ks_keystone_public_port = $os_params::ks_keystone_public_port, $ks_keystone_public_port = $os_params::ks_keystone_public_port,
$ks_keystone_public_port = $os_params::ks_keystone_public_port,
$ks_keystone_public_proto = $os_params::ks_keystone_public_proto, $ks_keystone_public_proto = $os_params::ks_keystone_public_proto,
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_proto = $os_params::ks_heat_public_proto,
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = $os_params::ks_heat_password,
$heat_db_host = $os_params::heat_db_host, $heat_db_host = $os_params::heat_db_host,
$heat_db_password = $os_params::heat_db_password $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,
) { ) {
$encoded_user = uriescape($heat_db_user) $encoded_user = uriescape($heat_db_user)
@@ -40,8 +43,11 @@ class os_orchestration_controller(
keystone_protocol => $ks_keystone_public_proto, keystone_protocol => $ks_keystone_public_proto,
keystone_password => $ks_heat_password, keystone_password => $ks_heat_password,
auth_uri => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/v2.0", auth_uri => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/v2.0",
rabbit_hosts => $os_params::rabbit_hosts, rabbit_hosts => $rabbit_hosts,
rabbit_password => $os_params::rabbit_password, rabbit_password => $rabbit_password,
rabbit_userid => 'heat',
verbose => $verbose,
debug => $debug,
} }
class { 'heat::api': } class { 'heat::api': }

15
roles/telemetry/telemetry_common.pp
View File

@@ -21,16 +21,19 @@
# #
class os_telemetry_common( class os_telemetry_common(
$ceilometer_secret = $os_params::ceilometer_secret,
$rabbit_hosts = $os_params::rabbit_hosts,
$rabbit_password = $os_params::rabbit_password,
$ks_keystone_internal_host
){ ){
class { 'ceilometer': class { 'ceilometer':
metering_secret => $os_params::ceilometer_secret, metering_secret => $ceilometer_secret,
rabbit_hosts => $os_params::rabbit_hosts, rabbit_hosts => $rabbit_hosts,
rabbit_password => $os_params::rabbit_password, rabbit_password => $rabbit_password,
rabbit_userid => 'ceilometer', rabbit_userid => 'ceilometer',
verbose => false, verbose => $verbose,
debug => false, debug => $debug,
} }
ceilometer_config { ceilometer_config {