aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-28 13:06:45 +0000
committerSteven Dake <stdake@cisco.com>2015-09-28 13:46:27 -0700
commitf098e766760f14debab2ca2a6cf8b77963101a70 (patch)
treedcb1d186d5d2d6e6ffa8d630b24494ead6377f1b /ansible
parent40f9f0816f8f94b4d11012a39af21d50195f9a74 (diff)
downloadkolla-f098e766760f14debab2ca2a6cf8b77963101a70.tar.gz
kolla-f098e766760f14debab2ca2a6cf8b77963101a70.zip
Remove config-external for rsyslog
Additionally, fix privleges for rsyslog container. It needs to be privleged otherwise it will complain about creating device node Change-Id: I364858f0a1df01b53cee46db3ec7cd5ecbe82c54 Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'ansible')
-rwxr-xr-xansible/roles/common/tasks/start.yml2
-rw-r--r--ansible/roles/common/templates/rsyslog.json.j29
2 files changed, 9 insertions, 2 deletions
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index cb0768426..09d504f01 100755
--- a/ansible/roles/common/tasks/start.yml
+++ b/ansible/roles/common/tasks/start.yml
@@ -1,5 +1,4 @@
---
-
- 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:
diff --git a/ansible/roles/common/templates/rsyslog.json.j2 b/ansible/roles/common/templates/rsyslog.json.j2
index fa7018e49..22c2f0eca 100644
--- a/ansible/roles/common/templates/rsyslog.json.j2
+++ b/ansible/roles/common/templates/rsyslog.json.j2
@@ -1,4 +1,11 @@
{
"command": "/usr/sbin/rsyslogd -n",
- "config_files": []
+ "config_files": [
+ {
+ "source": "/opt/kolla/config_files/rsyslog.conf",
+ "dest": "/etc/rsyslog.conf",
+ "owner": "root",
+ "perm": "0644"
+ }
+ ]
}