Merge "Add mode option when creating persistent directories."

deployment/aodh/aodh-api-container-puppet.yaml

@@ -245,6 +245,7 @@ outputs:
           path: "{{ item.path }}"
           setype: "{{ item.setype }}"
           state: directory
+          mode: "{{ item.mode|default(omit) }}"
         with_items:
           - { 'path': /var/log/containers/aodh, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/aodh-api, setype: container_file_t, 'mode': '0750' }

deployment/aodh/aodh-evaluator-container-puppet.yaml

@@ -113,6 +113,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': container_file_t, 'mode': '0750' }
       external_upgrade_tasks:

deployment/aodh/aodh-listener-container-puppet.yaml

@@ -113,6 +113,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': container_file_t, 'mode': '0750' }
       external_upgrade_tasks:

deployment/aodh/aodh-notifier-container-puppet.yaml

@@ -113,6 +113,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/aodh, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/aodh, 'setype': container_file_t }

deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@@ -169,6 +169,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': container_file_t, 'mode': '0750' }
       external_upgrade_tasks:

deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

@@ -118,6 +118,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

@@ -136,6 +136,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': container_file_t, 'mode': '0750' }
       fast_forward_upgrade_tasks:

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -203,6 +203,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/ceilometer, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/cinder/cinder-api-container-puppet.yaml

@@ -367,6 +367,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/cinder-api, 'setype': container_file_t, 'mode': '0750' }

deployment/cinder/cinder-common-container-puppet.yaml

@@ -71,6 +71,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode|default(omit) }}"
         with_items:
           - { 'path': /var/log/containers/cinder, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/lib/cinder, 'setype': container_file_t }

deployment/cinder/cinder-scheduler-container-puppet.yaml

@@ -134,6 +134,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/cinder, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/database/mysql-container-puppet.yaml

@@ -249,6 +249,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - {'path': /var/log/containers/mysql, 'setype': 'container_file_t', 'mode': '0750'}
             - {'path': /var/lib/mysql, 'setype': 'container_file_t'}

deployment/database/mysql-pacemaker-puppet.yaml

@@ -313,6 +313,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - {'path': /var/log/containers/mysql, 'setype': 'container_file_t', 'mode': '0750'}
             - {'path': /var/lib/mysql, 'setype': 'container_file_t'}

deployment/database/redis-container-puppet.yaml

@@ -218,6 +218,8 @@ outputs:
           file:
             path: "{{ item.path }}"
             state: directory
+            setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/redis, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/run/redis, 'setype': container_file_t }

deployment/database/redis-pacemaker-puppet.yaml

@@ -288,6 +288,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/lib/redis, 'setype': container_file_t }
             - { 'path': /var/log/containers/redis, 'setype': container_file_t, 'mode': '0750' }

deployment/deprecated/sahara/sahara-api-container-puppet.yaml

@@ -209,6 +209,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/sahara, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/sahara, 'setype': container_file_t }

deployment/deprecated/sahara/sahara-engine-container-puppet.yaml

@@ -126,6 +126,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/sahara, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/sahara, 'setype': container_file_t }

deployment/experimental/designate/designate-api-container-puppet.yaml

@@ -164,5 +164,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }

deployment/experimental/designate/designate-central-container-puppet.yaml

@@ -217,5 +217,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }

deployment/experimental/designate/designate-mdns-container-puppet.yaml

@@ -174,6 +174,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/designate, 'setype': container_file_t }
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }

deployment/experimental/designate/designate-producer-container-puppet.yaml

@@ -132,5 +132,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }

deployment/experimental/designate/designate-sink-container-puppet.yaml

@@ -124,5 +124,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }

deployment/experimental/designate/designate-worker-container-puppet.yaml

@@ -224,6 +224,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/designate, 'setype': container_file_t, 'mode': '0750' }
         - name: create persistent named directory

deployment/gnocchi/gnocchi-api-container-puppet.yaml

@@ -363,6 +363,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/gnocchi, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/gnocchi-api, 'setype': container_file_t, 'mode': '0750' }

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -158,6 +158,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/gnocchi, 'setype': container_file_t, 'mode': '0750' }
         - name: create persistent data directory

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -150,6 +150,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/gnocchi, 'setype': container_file_t, 'mode': '0750' }
         - name: create persistent data directory

deployment/haproxy/haproxy-container-puppet.yaml

@@ -369,6 +369,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
             - { 'path': /var/lib/haproxy, 'setype': container_file_t }

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -304,6 +304,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
             - { 'path': /var/lib/haproxy, 'setype': container_file_t }

deployment/horizon/horizon-container-puppet.yaml

@@ -324,6 +324,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/horizon, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/horizon, 'setype': container_file_t, 'mode': '0750' }

deployment/ironic/ironic-api-container-puppet.yaml

@@ -278,6 +278,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/ironic, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/ironic-api, 'setype': container_file_t, 'mode': '0750' }

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -574,6 +574,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            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 }

deployment/ironic/ironic-inspector-container-puppet.yaml

@@ -490,8 +490,10 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/ironic-inspector, 'setype': container_file_t, 'mode': '0750' }
+            - { 'path': /var/lib/ironic-inspector/dhcp-hostsdir, 'setype': container_file_t }
         - name: create persistent ironic-inspector dnsmasq dhcp hostsdir
           file:
             path: /var/lib/ironic-inspector/dhcp-hostsdir

deployment/ironic/ironic-pxe-container-puppet.yaml

@@ -165,6 +165,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/lib/ironic, 'setype': container_file_t }
             - { 'path': /var/log/containers/ironic, 'setype': container_file_t, 'mode': '0750' }

deployment/keepalived/keepalived-container-puppet.yaml

@@ -151,5 +151,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/keepalived, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/barbican-api.yaml

@@ -38,6 +38,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/barbican, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/barbican-api, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/glance-api.yaml

@@ -37,6 +37,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/glance, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/glance, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/heat-api-cfn.yaml

@@ -24,6 +24,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/heat-api-cfn, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/heat-api.yaml

@@ -24,6 +24,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/heat-api, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/heat-engine.yaml

@@ -39,5 +39,6 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/heat, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/keystone.yaml

@@ -39,6 +39,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/keystone, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/keystone, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/neutron-api.yaml

@@ -47,6 +47,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/neutron-api, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/neutron-common.yaml

@@ -35,5 +35,6 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/neutron, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/nova-api.yaml

@@ -47,6 +47,7 @@ outputs:
           path: "{{ item.path }}"
           setype: "{{ item.setype }}"
           state: directory
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/nova-api, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/nova-common.yaml

@@ -67,5 +67,6 @@ outputs:
           path: "{{ item.path }}"
           setype: "{{ item.setype }}"
           state: directory
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/nova-libvirt.yaml

@@ -50,5 +50,6 @@ outputs:
           path: "{{ item.path }}"
           setype: "{{ item.setype }}"
           state: directory
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/libvirt, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/nova-metadata.yaml

@@ -36,6 +36,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/nova, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/nova-metadata, 'setype': container_file_t, 'mode': '0750' }

deployment/logging/files/placement-api.yaml

@@ -36,6 +36,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode }}"
         with_items:
           - { 'path': /var/log/containers/placement, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/log/containers/httpd/placement, 'setype': container_file_t, 'mode': '0750' }

deployment/manila/manila-api-container-puppet.yaml

@@ -250,6 +250,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/manila-api, 'setype': container_file_t, 'mode': '0750' }

deployment/manila/manila-scheduler-container-puppet.yaml

@@ -108,6 +108,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/manila/manila-share-container-puppet.yaml

@@ -181,6 +181,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/manila, 'setype': container_file_t }

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -200,6 +200,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/manila, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/manila, 'setype': container_file_t }

deployment/messaging/rpc-qdrouterd-container-puppet.yaml

@@ -148,6 +148,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode|default(omit) }}"
         with_items:
           - { 'path': /var/log/containers/qdrouterd, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/lib/qdrouterd, 'setype': container_file_t }

deployment/metrics/collectd-container-puppet.yaml

@@ -730,6 +730,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/collectd, 'setype': container_file_t, 'mode': '0750' }
       fast_forward_upgrade_tasks:

deployment/metrics/qdr-container-puppet.yaml

@@ -347,6 +347,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/metrics-qdr, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/metrics-qdr, 'setype': container_file_t }

deployment/mistral/mistral-api-container-puppet.yaml

@@ -248,6 +248,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' }
       deploy_steps_tasks:

deployment/mistral/mistral-engine-container-puppet.yaml

@@ -136,6 +136,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/mistral/mistral-event-engine-container-puppet.yaml

@@ -111,6 +111,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' }
         - name: enable virt_sandbox_use_netlink for healthcheck

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -217,6 +217,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/mistral, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/mistral, 'setype': container_file_t }

deployment/nova/nova-ironic-container-puppet.yaml

@@ -212,6 +212,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/nova, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/nova, 'setype': container_file_t }

deployment/nova/novajoin-container-puppet.yaml

@@ -245,6 +245,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/novajoin, 'setype': container_file_t, 'mode': '0750' }
         - name: Enroll to FreeIPA

deployment/octavia/octavia-api-container-puppet.yaml

@@ -380,6 +380,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/octavia-api, 'setype': container_file_t, 'mode': '0750' }

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

@@ -154,5 +154,6 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }

deployment/octavia/octavia-housekeeping-container-puppet.yaml

@@ -153,6 +153,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
       upgrade_tasks: []

deployment/octavia/octavia-worker-container-puppet.yaml

@@ -140,6 +140,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
         - block:

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -285,6 +285,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': container_file_t }

deployment/ovn/ovn-dbs-container-puppet.yaml

@@ -201,6 +201,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': container_file_t }

deployment/ovn/ovn-dbs-pacemaker-puppet.yaml

@@ -271,6 +271,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/openvswitch, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/openvswitch/ovn, 'setype': container_file_t }

deployment/qdr/qdrouterd-container-puppet.yaml

@@ -138,6 +138,7 @@ outputs:
           path: "{{ item.path }}"
           state: directory
           setype: "{{ item.setype }}"
+          mode: "{{ item.mode|default(omit) }}"
         with_items:
           - { 'path': /var/log/containers/qdrouterd, 'setype': container_file_t, 'mode': '0750' }
           - { 'path': /var/lib/qdrouterd, 'setype': container_file_t }

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -339,6 +339,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }

deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@@ -285,6 +285,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -245,6 +245,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -245,6 +245,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }

deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@@ -285,6 +285,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -253,6 +253,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/lib/rabbitmq, 'setype': container_file_t }
             - { 'path': /var/log/containers/rabbitmq, 'setype': container_file_t, 'mode': '0750' }

deployment/swift/swift-proxy-container-puppet.yaml

@@ -434,6 +434,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /srv/node, 'setype': container_file_t }
             - { 'path': /var/log/swift, 'setype': container_file_t }

deployment/swift/swift-storage-container-puppet.yaml

@@ -597,6 +597,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /srv/node, 'setype': container_file_t }
             - { 'path': /var/cache/swift, 'setype': container_file_t }

deployment/undercloud/tempest-container-puppet.yaml

@@ -58,6 +58,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode|default(omit) }}"
           with_items:
             - { 'path': /var/log/containers/tempest, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/lib/tempestdata, 'setype': container_file_t }

deployment/zaqar/zaqar-container-puppet.yaml

@@ -384,6 +384,7 @@ outputs:
             path: "{{ item.path }}"
             state: directory
             setype: "{{ item.setype }}"
+            mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/zaqar, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/zaqar, 'setype': container_file_t, 'mode': '0750' }