Fix ownership of octavia_rsyslog log directory

The octavia_rsyslog container should not use the octavia user and group
since the rsyslog image doesn't know about that user. It should use
root and have a dedicated log directory on the host to avoid mixing
ownerships with the octavia containers that are running as octavia user.

Conflicts:
	deployment/octavia/octavia-health-manager-container-puppet.yaml

Change-Id: Ie7eb7905eb33235fc73f94b9e84f553394e951fd
Closes-Bug: #1907260
(cherry picked from commit ffd86b3f2c)
(cherry picked from commit 890c149f5a)
(cherry picked from commit 94236c7576)
This commit is contained in:
Gregory Thiemonge 2020-12-09 08:27:48 +01:00
parent e226e0053e
commit 4dd0f9dab5
1 changed files with 3 additions and 2 deletions

View File

@ -140,7 +140,7 @@ outputs:
preserve_properties: true
permissions:
- path: /var/log/octavia
owner: octavia:octavia
owner: root:root
recurse: true
docker_config:
step_2:
@ -191,7 +191,7 @@ outputs:
-
- /var/lib/kolla/config_files/octavia_rsyslog.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro
- /var/log/containers/octavia:/var/log/octavia:z
- /var/log/containers/octavia-amphorae:/var/log/octavia:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
- {}
@ -205,3 +205,4 @@ outputs:
mode: "{{ item.mode }}"
with_items:
- { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
- { 'path': /var/log/containers/octavia-amphorae, 'setype': svirt_sandbox_file_t, 'mode': '0750' }