diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-27 13:25:32 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-27 13:44:50 +0000 |
| commit | f2aea128b320f77050cef5b55417914c95aeeafb (patch) | |
| tree | 82692694487fa58cdb48134965001a5d1ca6ae4f | |
| parent | 94ea43fa555fac20c15cdb4f4214af20913b6270 (diff) | |
| download | kolla-f2aea128b320f77050cef5b55417914c95aeeafb.tar.gz kolla-f2aea128b320f77050cef5b55417914c95aeeafb.zip | |
Replace config-external - rsyslog
Change-Id: Ic19c1a0e975f6097813cad52f880042e33730ff8
Partially-Implements: blueprint replace-config-external
| -rwxr-xr-x | ansible/roles/common/tasks/config.yml | 5 | ||||
| -rwxr-xr-x | ansible/roles/common/tasks/start.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/common/templates/rsyslog.json.j2 | 4 | ||||
| -rwxr-xr-x | docker/logging/rsyslog/start.sh | 8 |
4 files changed, 12 insertions, 7 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 2b381dc70..05587ca7f 100755 --- a/ansible/roles/common/tasks/config.yml +++ b/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" diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index 7b37d0cd6..cb0768426 100755 --- a/ansible/roles/common/tasks/start.yml +++ b/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 }}" diff --git a/ansible/roles/common/templates/rsyslog.json.j2 b/ansible/roles/common/templates/rsyslog.json.j2 new file mode 100644 index 000000000..fa7018e49 --- /dev/null +++ b/ansible/roles/common/templates/rsyslog.json.j2 @@ -0,0 +1,4 @@ +{ + "command": "/usr/sbin/rsyslogd -n", + "config_files": [] +} diff --git a/docker/logging/rsyslog/start.sh b/docker/logging/rsyslog/start.sh index e005d7f43..2d40de141 100755 --- a/docker/logging/rsyslog/start.sh +++ b/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 |