diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-15 13:05:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-15 13:05:19 +0000 |
| commit | 7c095c0a2d6fc1955e7916de66e3c998ec560af4 (patch) | |
| tree | f835f383d26fbf8bd576c47c0443a43612b7d6bc | |
| parent | ef0d8da2cbd941eabeefed9eb338b3fb4ad34900 (diff) | |
| parent | 5d5b2098231923edbdf7f1f8e79e7890885623f4 (diff) | |
| download | kolla-7c095c0a2d6fc1955e7916de66e3c998ec560af4.tar.gz kolla-7c095c0a2d6fc1955e7916de66e3c998ec560af4.zip | |
Merge "Add 'optional' param for mariadb heka conf"
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 2cb4bcbe5..5b2de756a 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", |