diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-05 16:18:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-05 16:18:39 +0000 |
| commit | b58147bcc0a98f694075b9593bffced1ab63bec0 (patch) | |
| tree | ead17326efb555d5a75a05c2cd143186400e125a | |
| parent | 9413e4d27c2a0e12e8d348ab6f9ec67043f5ec1e (diff) | |
| parent | dcd8dda99f9455b5970aa2945ad1e7e876368580 (diff) | |
| download | kolla-b58147bcc0a98f694075b9593bffced1ab63bec0.tar.gz kolla-b58147bcc0a98f694075b9593bffced1ab63bec0.zip | |
Merge "Heka template missing optional params"
| -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", |