openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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.

Change-Id: Ie7eb7905eb33235fc73f94b9e84f553394e951fd
Closes-Bug: #1907260
This commit is contained in:
Gregory Thiemonge 2020-12-09 08:27:48 +01:00
parent efd1975513
commit ffd86b3f2c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/octavia/octavia-health-manager-container-puppet.yaml
View File

@ -140,7 +140,7 @@ outputs:
preserve_properties: true preserve_properties: true
permissions: permissions:
- path: /var/log/octavia - path: /var/log/octavia
owner: octavia:octavia owner: root:root
recurse: true recurse: true
docker_config: docker_config:
step_2: 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/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/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: environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
- {} - {}
@ -205,3 +205,4 @@ outputs:
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
with_items: with_items:
- { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' } - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/log/containers/octavia-amphorae, 'setype': container_file_t, 'mode': '0750' }