openstack
/
puppet-heat
Code Issues Proposed changes

Fix typo in manifests

This commit is contained in:
Émilien Macchi 2013-06-04 22:56:29 +02:00
parent 22f0c06b8a
commit 170180fabf
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api-cloudwatch.pp
View File

@ -44,17 +44,17 @@ class heat::api-cloudwatch (
value => join($rabbit_hosts, ',')
}
} else {
heat_api_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
heat_api_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
heat_api_config { 'DEFAULT/rabbit_hosts':
heat_api_cloudwatch_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
heat_api_cloudwatch_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
heat_api_cloudwatch_config { 'DEFAULT/rabbit_hosts':
value => "${rabbit_host}:${rabbit_port}"
}
}
if size($rabbit_hosts) > 1 {
heat_api_config { 'DEFAULT/rabbit_ha_queues': value => true }
heat_api_cloudwatch_config { 'DEFAULT/rabbit_ha_queues': value => true }
} else {
heat_api_config { 'DEFAULT/rabbit_ha_queues': value => false }
heat_api_cloudwatch-config { 'DEFAULT/rabbit_ha_queues': value => false }
}
service { 'heat-api-cloudwatch':

16
manifests/engine.pp
View File

@ -46,23 +46,23 @@ class heat::engine (
Package['heat-common'] -> Service['heat-engine']
if $rabbit_hosts {
heat_api_config { 'DEFAULT/rabbit_host': ensure => absent }
heat_api_config { 'DEFAULT/rabbit_port': ensure => absent }
heat_api_config { 'DEFAULT/rabbit_hosts':
heat_engine_config { 'DEFAULT/rabbit_host': ensure => absent }
heat_engine_config { 'DEFAULT/rabbit_port': ensure => absent }
heat_engine_config { 'DEFAULT/rabbit_hosts':
value => join($rabbit_hosts, ',')
}
} else {
heat_api_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
heat_api_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
heat_api_config { 'DEFAULT/rabbit_hosts':
heat_engine_config { 'DEFAULT/rabbit_host': value => $rabbit_host }
heat_engine_config { 'DEFAULT/rabbit_port': value => $rabbit_port }
heat_engine_config { 'DEFAULT/rabbit_hosts':
value => "${rabbit_host}:${rabbit_port}"
}
}
if size($rabbit_hosts) > 1 {
heat_api_config { 'DEFAULT/rabbit_ha_queues': value => true }
heat_engine_config { 'DEFAULT/rabbit_ha_queues': value => true }
} else {
heat_api_config { 'DEFAULT/rabbit_ha_queues': value => false }
heat_engine_config { 'DEFAULT/rabbit_ha_queues': value => false }
}
service { 'heat-engine':