Merge "Make Heka write Keepalived logs to dedicated directory"

ansible/roles/common/tasks/config.yml

@@ -27,6 +27,7 @@
     - { name: "global", enabled: "yes" }
     - { name: "haproxy", enabled: "{{ enable_haproxy }}" }
     - { name: "horizon", enabled: "{{ enable_horizon }}" }
+    - { name: "keepalived", enabled: "{{ enable_haproxy }}" }
     - { name: "keystone", enabled: "{{ enable_keystone }}" }
     - { name: "mariadb", enabled: "{{ enable_mariadb }}" }
     - { name: "openstack", enabled: "yes" }

ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2

@@ -1,3 +1,3 @@
-"/var/log/kolla/haproxy/keepalived.log"
+"/var/log/kolla/keepalived/keepalived.log"
 {
 }

ansible/roles/common/templates/heka-haproxy.toml.j2

@@ -1,4 +1,4 @@
-# HAProxy and Keepalived write their logs to Syslog, so the generic
+# HAProxy writes its logs to Syslog, so the generic
 # Syslog input set in heka-global.toml.j2 is used.
 
 [haproxy_file_output]
@@ -7,10 +7,3 @@ message_matcher = "Fields[programname] =~ /(?i:haproxy)/"
 path = "/var/log/kolla/haproxy/haproxy.log"
 encoder = "syslog_encoder"
 folder_perm = "755"
-
-[keepalived_file_output]
-type = "FileOutput"
-message_matcher = "Fields[programname] =~ /(?i:keepalived)/"
-path = "/var/log/kolla/haproxy/keepalived.log"
-encoder = "syslog_encoder"
-folder_perm = "755"

ansible/roles/common/templates/heka-keepalived.toml.j2

@@ -0,0 +1,9 @@
+# Keepalived writes its logs to Syslog, so the generic
+# Syslog input set in heka-global.toml.j2 is used.
+
+[keepalived_file_output]
+type = "FileOutput"
+message_matcher = "Fields[programname] =~ /(?i:keepalived)/"
+path = "/var/log/kolla/keepalived/keepalived.log"
+encoder = "syslog_encoder"
+folder_perm = "755"

ansible/roles/common/templates/heka.json.j2

@@ -22,6 +22,13 @@
             "perm": "0600",
             "optional": {{ (not enable_haproxy | bool) | string | lower }}
         },
+        {
+            "source": "{{ container_config_directory }}/heka-keepalived.toml",
+            "dest": "/etc/heka/heka-keepalived.toml",
+            "owner": "heka",
+            "perm": "0600",
+            "optional": {{ (not enable_haproxy | bool) | string | lower }}
+        },
         {
             "source": "{{ container_config_directory }}/heka-rabbitmq.toml",
             "dest": "/etc/heka/heka-rabbitmq.toml",