Merge "Remove config-external for rsyslog"

ansible/roles/common/tasks/start.yml

 ---
-
 - name: Starting log_data container
   docker:
     docker_api_version: "{{ docker_api_version }}"
@@ -31,6 +30,7 @@
     username: "{{ docker_registry_username }}"
     password: "{{ docker_registry_password }}"
     insecure_registry: "{{ docker_insecure_registry }}"
+    privileged: True
     name: rsyslog
     image: "{{ rsyslog_image_full }}"
     volumes_from:

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

 {
     "command": "/usr/sbin/rsyslogd -n",
-    "config_files": []
+    "config_files": [
+        {
+            "source": "/opt/kolla/config_files/rsyslog.conf",
+            "dest": "/etc/rsyslog.conf",
+            "owner": "root",
+            "perm": "0644"
+        }
+    ]
 }

docker/logging/rsyslog/Dockerfile.j2

@@ -12,7 +12,6 @@ RUN apt-get install -y --no-install-recommends \
     && apt-get clean
 {% endif %}
 
-COPY config-external.sh /opt/kolla/
 COPY start.sh /
 
 CMD ["/start.sh"]

docker/logging/rsyslog/config-external.sh

-#!/bin/bash
-
-if [[ -f "/dev/log" ]]; then
-    rm "/dev/log"
-fi
-
-SOURCE="/opt/kolla/rsyslog/rsyslog.conf"
-TARGET="/etc/rsyslog.conf"
-OWNER="root"
-
-if [[ -f "$SOURCE" ]]; then
-    rm $TARGET
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi