From 5d5b2098231923edbdf7f1f8e79e7890885623f4 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Fri, 15 Jul 2016 11:02:59 +0100 Subject: [PATCH] Add 'optional' param for mariadb heka conf If one is using an existing or alternative mysql deployment and sets enable_mariadb to false, heka would fail to deploy. TrivialFix Change-Id: Ieb793e11a40358e5d4fc1f3955f200e2cddef4f5 --- ansible/roles/common/templates/heka.json.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 2cb4bcbe54..5b2de756a4 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -45,7 +45,8 @@ "source": "{{ container_config_directory }}/heka-mariadb.toml", "dest": "/etc/heka/heka-mariadb.toml", "owner": "heka", - "perm": "0600" + "perm": "0600", + "optional": {{ (not enable_mariadb | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/heka-keystone.toml",