diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-10-05 15:30:38 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-10-05 15:30:38 +0100 |
| commit | dcd8dda99f9455b5970aa2945ad1e7e876368580 (patch) | |
| tree | abe4ff08f8dc01e935b615f66315cf16c19f34f2 | |
| parent | 4b143f09e14783376c0b07eb43dfc790c01c6c29 (diff) | |
| download | kolla-dcd8dda99f9455b5970aa2945ad1e7e876368580.tar.gz kolla-dcd8dda99f9455b5970aa2945ad1e7e876368580.zip | |
Heka template missing optional params
If enable_rabbitmq or enable_keystone are false, the configs will not be
copied to target nodes for these. This resulted in Heka failing to
start.
Change-Id: I93d15534802b671f1f42e8b2dfb523a17526ffb7
Closes-Bug: #1630613
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index ec129bf1c..bb2ae3504 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -61,7 +61,8 @@ "source": "{{ container_config_directory }}/heka-rabbitmq.toml", "dest": "/etc/heka/heka-rabbitmq.toml", "owner": "heka", - "perm": "0600" + "perm": "0600", + "optional": {{ (not enable_rabbitmq | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/heka-openstack.toml", @@ -80,7 +81,8 @@ "source": "{{ container_config_directory }}/heka-keystone.toml", "dest": "/etc/heka/heka-keystone.toml", "owner": "heka", - "perm": "0600" + "perm": "0600", + "optional": {{ (not enable_keystone | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/heka-horizon.toml", |