Merge "Set setgid mode bit for /var/lib/ironic"

openstack-archive · Dec 11, 2020 · 7b12da0 · 7b12da0
2 parents af2852d + d582c09
commit 7b12da0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -603,7 +603,7 @@ outputs:
             mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': container_file_t, 'mode': '0750' }
-            - { 'path': /var/lib/ironic, 'setype': container_file_t }
+            - { 'path': /var/lib/ironic, 'setype': container_file_t, 'mode': 'g+s' }
         - name: stat /httpboot
           stat: path=/httpboot
           register: stat_httpboot

diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml
@@ -174,6 +174,6 @@ outputs:
             setype: "{{ item.setype }}"
             mode: "{{ item.mode|default(omit) }}"
           with_items:
-            - { 'path': /var/lib/ironic, 'setype': container_file_t }
+            - { 'path': /var/lib/ironic, 'setype': container_file_t, 'mode': 'g+s' }
             - { 'path': /var/log/containers/ironic, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/ironic-pxe, 'setype': container_file_t, 'mode': '0750' }