From 9c1b43262c479b7b7aec19c588cfa0219fad7950 Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Wed, 16 Dec 2015 17:22:54 +0100 Subject: [PATCH] Fix heat template with latest puppet-heat After https://review.openstack.org/249119 was merged, the default value for the kombu_ssl_* parameters was no longer undef, but $::os_service_default. Change-Id: I2b28f5d2eab809011a8b90a1abe69bfe45851972 --- packstack/puppet/templates/heat_rabbitmq.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packstack/puppet/templates/heat_rabbitmq.pp b/packstack/puppet/templates/heat_rabbitmq.pp index 795c2b344..737ffb991 100644 --- a/packstack/puppet/templates/heat_rabbitmq.pp +++ b/packstack/puppet/templates/heat_rabbitmq.pp @@ -1,11 +1,11 @@ $heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW') $heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL') -$kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', undef) -$kombu_ssl_keyfile = hiera('CONFIG_HEAT_SSL_KEY', undef) -$kombu_ssl_certfile = hiera('CONFIG_HEAT_SSL_CERT', undef) +$kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', $::os_service_default) +$kombu_ssl_keyfile = hiera('CONFIG_HEAT_SSL_KEY', $::os_service_default) +$kombu_ssl_certfile = hiera('CONFIG_HEAT_SSL_CERT', $::os_service_default) -if $kombu_ssl_keyfile { +if ! is_service_default($kombu_ssl_keyfile) { $files_to_set_owner = [ $kombu_ssl_keyfile, $kombu_ssl_certfile ] file { $files_to_set_owner: owner => 'heat',