diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-30 07:47:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-30 07:47:26 +0000 |
| commit | 981d8206abbe3aab42af371c8d8a76face9406b4 (patch) | |
| tree | 37b1b4c71409ea98dada194d35a6b87eeeee646a | |
| parent | 45f6b673e3c2329a0f578dc2a3b7069a4d327946 (diff) | |
| parent | 9a910d6b1e2fd770ad84a9f8366a0b4f200f09f4 (diff) | |
| download | kolla-981d8206abbe3aab42af371c8d8a76face9406b4.tar.gz kolla-981d8206abbe3aab42af371c8d8a76face9406b4.zip | |
Merge "Starting heka bootstrap container failed in deployment"
| -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 94bd31d1e..a23162d01 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -19,7 +19,8 @@ "source": "{{ container_config_directory }}/heka-haproxy.toml", "dest": "/etc/heka/heka-haproxy.toml", "owner": "heka", - "perm": "0600" + "perm": "0600", + "optional": {{ (not enable_haproxy | bool) | string | lower }} }, { "source": "{{ container_config_directory }}/heka-rabbitmq.toml", |