From 170180fabf45cc1aa578bd22ff4650350c21ac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milien=20Macchi?= Date: Tue, 4 Jun 2013 22:56:29 +0200 Subject: [PATCH] Fix typo in manifests --- manifests/api-cloudwatch.pp | 10 +++++----- manifests/engine.pp | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manifests/api-cloudwatch.pp b/manifests/api-cloudwatch.pp index 52a69dba..65ce24aa 100644 --- a/manifests/api-cloudwatch.pp +++ b/manifests/api-cloudwatch.pp @@ -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': diff --git a/manifests/engine.pp b/manifests/engine.pp index 47c2b60a..b3eb3638 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -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':