Merge "Replace config-external - rsyslog"

ansible/roles/common/tasks/config.yml

@@ -5,6 +5,11 @@
     state: "directory"
     recurse: "yes"
 
+- name: Copying over rsyslog JSON configuration file
+  template:
+    src: "rsyslog.json.j2"
+    dest: "{{ node_config_directory }}/rsyslog/config.json"
+
 - name: Copying over config(s)
   template:
     src: "rsyslog.conf.j2"

ansible/roles/common/tasks/start.yml

@@ -37,7 +37,7 @@
       - "log_data"
     volumes:
       - "/var/lib/kolla/dev:/dev"
-      - "{{ node_config_directory }}/rsyslog/:/opt/kolla/rsyslog/:ro"
+      - "{{ node_config_directory }}/rsyslog/:/opt/kolla/config_files/:ro"
     env:
         KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
 

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

@@ -0,0 +1,4 @@
+{
+    "command": "/usr/sbin/rsyslogd -n",
+    "config_files": []
+}

docker/logging/rsyslog/start.sh

@@ -1,14 +1,10 @@
 #!/bin/bash
-
 set -o errexit
 
-CMD="/usr/sbin/rsyslogd"
-ARGS="-n"
-
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
 
 exec $CMD $ARGS