From c7adc9c1a913ae5d0701d0c7bf98bf4303fcd11a Mon Sep 17 00:00:00 2001
From: Jason Dunsmore <jasondunsmore@gmail.com>
Date: Thu, 19 May 2016 14:20:12 -0500
Subject: [PATCH] Apply tripleo-image-elements fixes to agent configs

Fix configuration of os-collect-config collectors and add zaqar
collector.

Change-Id: Ia4ed349f34b407947f35e3efe228653506fc6775
Closes-Bug: #1567584
---
 .../templates/fragments/configure_config_agent.sh     | 11 ++++++++++-
 .../scripts/configure_container_agent.sh              | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/hot/software-config/boot-config/templates/fragments/configure_config_agent.sh b/hot/software-config/boot-config/templates/fragments/configure_config_agent.sh
index 42e1d3a3..e65c7ccb 100644
--- a/hot/software-config/boot-config/templates/fragments/configure_config_agent.sh
+++ b/hot/software-config/boot-config/templates/fragments/configure_config_agent.sh
@@ -28,7 +28,7 @@ polling_interval = {{polling_interval}}
 cachedir = {{cachedir}}
 {{/cachedir}}
 {{#collectors}}
-collectors = {{collectors}}
+collectors = {{.}}
 {{/collectors}}
 
 {{#cfn}}
@@ -52,6 +52,15 @@ stack_id = {{stack_id}}
 resource_name = {{resource_name}}
 {{/heat}}
 
+{{#zaqar}}
+[zaqar]
+auth_url = {{auth_url}}
+user_id = {{user_id}}
+password = {{password}}
+project_id = {{project_id}}
+queue_id = {{queue_id}}
+{{/zaqar}}
+
 {{#request}}
 [request]
 {{#metadata_url}}
diff --git a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
index aac84c23..a0e53d91 100644
--- a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
+++ b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
@@ -42,7 +42,7 @@ polling_interval = {{polling_interval}}
 cachedir = {{cachedir}}
 {{/cachedir}}
 {{#collectors}}
-collectors = {{collectors}}
+collectors = {{.}}
 {{/collectors}}
 
 {{#cfn}}
@@ -66,6 +66,15 @@ stack_id = {{stack_id}}
 resource_name = {{resource_name}}
 {{/heat}}
 
+{{#zaqar}}
+[zaqar]
+auth_url = {{auth_url}}
+user_id = {{user_id}}
+password = {{password}}
+project_id = {{project_id}}
+queue_id = {{queue_id}}
+{{/zaqar}}
+
 {{#request}}
 [request]
 {{#metadata_url}}