aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-27 08:08:38 +0000
committerGerrit Code Review <review@openstack.org>2016-09-27 08:08:38 +0000
commitb27f11384db332f7e3daadd161c291ba4f6216dc (patch)
tree5b0742a9eb80ff95c51a709e2041d6b249a8caf1
parent04c4f63a531c7b1b32a2e186fb0249bb364bb361 (diff)
parent53451df03ec38045fb0df397a23cc780d9e86672 (diff)
downloadkolla-b27f11384db332f7e3daadd161c291ba4f6216dc.tar.gz
kolla-b27f11384db332f7e3daadd161c291ba4f6216dc.zip
Merge "add aodh gnocchi barbican in heka.json.j2"
-rw-r--r--ansible/roles/common/templates/heka.json.j221
1 files changed, 21 insertions, 0 deletions
diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2
index 11a73c55e..ec129bf1c 100644
--- a/ansible/roles/common/templates/heka.json.j2
+++ b/ansible/roles/common/templates/heka.json.j2
@@ -16,6 +16,27 @@
"perm": "0600"
},
{
+ "source": "{{ container_config_directory }}/heka-aodh.toml",
+ "dest": "/etc/heka/heka-aodh.toml",
+ "owner": "heka",
+ "perm": "0600",
+ "optional": {{ (not enable_aodh | bool) | string | lower }}
+ },
+ {
+ "source": "{{ container_config_directory }}/heka-gnocchi.toml",
+ "dest": "/etc/heka/heka-gnocchi.toml",
+ "owner": "heka",
+ "perm": "0600",
+ "optional": {{ (not enable_gnocchi | bool) | string | lower }}
+ },
+ {
+ "source": "{{ container_config_directory }}/heka-barbican.toml",
+ "dest": "/etc/heka/heka-barbican.toml",
+ "owner": "heka",
+ "perm": "0600",
+ "optional": {{ (not enable_barbican | bool) | string | lower }}
+ },
+ {
"source": "{{ container_config_directory }}/heka-custom.toml",
"dest": "/etc/heka/heka-custom.toml",
"owner": "heka",