From 86bf28728c62320847512ff32ca513f1abe15783 Mon Sep 17 00:00:00 2001 From: Shaik Apsar Date: Fri, 22 Apr 2016 16:20:33 +0530 Subject: [PATCH] Add amqp_durable_queues option in trove-guestagent.conf.erb. Change-Id: I23f580d1ccd5261ff7090d182e0da2076012555b Closes-Bug: #1573523 --- spec/classes/trove_taskmanager_spec.rb | 1 + templates/trove-guestagent.conf.erb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/spec/classes/trove_taskmanager_spec.rb b/spec/classes/trove_taskmanager_spec.rb index f2625f55..32c7333a 100644 --- a/spec/classes/trove_taskmanager_spec.rb +++ b/spec/classes/trove_taskmanager_spec.rb @@ -125,6 +125,7 @@ describe 'trove::taskmanager' do is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_host=10.0.0.1$/) is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^#rabbit_port=5672$/) is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_ha_queues=true$/) + is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^amqp_durable_queues=true$/) end end diff --git a/templates/trove-guestagent.conf.erb b/templates/trove-guestagent.conf.erb index 429dd761..456b1535 100644 --- a/templates/trove-guestagent.conf.erb +++ b/templates/trove-guestagent.conf.erb @@ -138,6 +138,9 @@ rabbit_ha_queues=true <%- end -%> <%- end -%> +<%- if @amqp_durable_queues and @amqp_durable_queues != "" -%> +amqp_durable_queues=<%= @amqp_durable_queues %> +<%- end -%> # ========== Datastore Specific Configuration Options ==========