Remove unnecessary slash volume maps

When podman parses such volume map it removes the slash
automatically and shows in inspection volumes w/o slash.
When comparing configurations it turns to be a difference and
it breaks idempotency of containers, causing them to be recreated.

Change-Id: Ifdebecc8c7975b6f5cfefb14b0133be247b7abf0

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

@@ -199,7 +199,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/aodh_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/aodh:/var/log/aodh
                   - /var/log/containers/httpd/aodh-api:/var/log/httpd
                   -

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

@@ -103,7 +103,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/aodh_evaluator.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/aodh:/var/log/aodh:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -103,7 +103,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/aodh_listener.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/aodh:/var/log/aodh:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -103,7 +103,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/aodh_notifier.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/aodh:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/aodh:/var/log/aodh:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -655,7 +655,7 @@ outputs:
                     - {get_attr: [BarbicanApiLogging, volumes]}
                     -
                       - /var/lib/kolla/config_files/barbican_api.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro
                     -
                       if:
                         - internal_tls_enabled
@@ -693,7 +693,7 @@ outputs:
                     - {get_attr: [BarbicanApiLogging, volumes]}
                     -
                       - /var/lib/kolla/config_files/barbican_keystone_listener.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro
                 environment: *kolla_env
             - barbican_worker:
                 start_order: 7
@@ -709,7 +709,7 @@ outputs:
                     - {get_attr: [BarbicanApiLogging, volumes]}
                     -
                       - /var/lib/kolla/config_files/barbican_worker.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/barbican:/var/lib/kolla/config_files/src:ro
                     -
                       if:
                         - thales_hsm_enabled

deployment/cavium/liquidio-compute-config-container-puppet.yaml

@@ -116,7 +116,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/liquidio_config.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/liquidio/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/liquidio:/var/lib/kolla/config_files/src:ro
                   - /etc/udev/:/etc/udev/:z
                   - /usr/lib/udev/:/usr/lib/udev/:z
                   - /lib/modules/:/lib/modules/:z

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

@@ -126,7 +126,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ceilometer_agent_central.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ceilometer:/var/log/ceilometer:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -107,7 +107,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
                   - /var/run/libvirt:/var/run/libvirt:ro
                   - /var/log/containers/ceilometer:/var/log/ceilometer:z
             environment:

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

@@ -127,7 +127,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:

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

@@ -113,7 +113,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ceilometer:/var/log/ceilometer:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -287,7 +287,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/cinder:/var/log/cinder:z
                   - /var/log/containers/httpd/cinder-api:/var/log/httpd:z
                   -
@@ -315,7 +315,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_api_cron.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/cinder:/var/log/cinder:z
                   - /var/log/containers/httpd/cinder-api:/var/log/httpd:z
             environment:

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -185,7 +185,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
           cinder_backup_init_bundle:
             start_order: 1
             detach: false

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

@@ -150,7 +150,7 @@ outputs:
         - {get_param: CinderVolumeOptVolumes}
         -
           - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
-          - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+          - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
           - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
           - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
           - /lib/modules:/lib/modules:ro
@@ -185,7 +185,7 @@ outputs:
         - {get_attr: [ContainersCommon, volumes]}
         -
           - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro
-          - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+          - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
           - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
           - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
           - /dev/:/dev/

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

@@ -124,7 +124,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_scheduler.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/cinder:/var/log/cinder:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -170,7 +170,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro
           cinder_volume_init_bundle:
             start_order: 1
             detach: false

deployment/database/mysql-container-puppet.yaml

@@ -158,7 +158,7 @@ outputs:
               list_concat:
               -
                 - /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json
-                - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
+                - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro
                 - /etc/localtime:/etc/localtime:ro
                 - /etc/hosts:/etc/hosts:ro
                 - /var/lib/mysql:/var/lib/mysql

deployment/database/mysql-pacemaker-puppet.yaml

@@ -234,7 +234,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:rw,z
-                  - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro,z
+                  - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro,z
                   - /var/lib/mysql:/var/lib/mysql:rw,z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
@@ -263,7 +263,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/mysql:/var/lib/kolla/config_files/src:ro
           mysql_init_bundle:
             start_order: 1
             detach: false

deployment/database/redis-container-puppet.yaml

@@ -175,7 +175,7 @@ outputs:
                 volumes:
                   - /run:/run
                   - /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
                   - /etc/localtime:/etc/localtime:ro
                   - /var/log/containers/redis:/var/log/redis:z
                   - /var/run/redis:/var/run/redis:z
@@ -196,7 +196,7 @@ outputs:
                         - {get_attr: [ContainersCommon, volumes]}
                         -
                           - /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                          - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
+                          - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
                           - /etc/pki/tls/certs/redis.crt:/etc/pki/tls/certs/redis.crt:ro
                           - /etc/pki/tls/private/redis.key:/etc/pki/tls/private/redis.key:ro
                     environment:

deployment/database/redis-pacemaker-puppet.yaml

@@ -219,7 +219,7 @@ outputs:
                 volumes:
                   list_concat:
                     - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                    - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
+                    - - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
             - redis_init_bundle:
                 start_order: 2
                 detach: false
@@ -262,7 +262,7 @@ outputs:
                         - {get_attr: [ContainersCommon, volumes]}
                         -
                           - /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                          - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
+                          - /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
                           - /etc/pki/tls/certs/redis.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/redis.crt:ro
                           - /etc/pki/tls/private/redis.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/redis.key:ro
                     environment:

deployment/etcd/etcd-container-puppet.yaml

@@ -138,7 +138,7 @@ outputs:
               - /var/lib/etcd:/var/lib/etcd
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/etcd/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/puppet-generated/etcd:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:

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

@@ -149,7 +149,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/designate_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -185,7 +185,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_central.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -164,7 +164,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_mdns.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -122,7 +122,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_producer.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -114,7 +114,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_sink.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -199,7 +199,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_worker.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
@@ -214,7 +214,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/designate_backend_bind9.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/designate/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/designate:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/designate:/var/log/designate:z
                   - /var/named-persistent:/var/named-persistent:z
             environment:

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

@@ -528,7 +528,7 @@ outputs:
                 - {get_param: GlanceApiOptVolumes}
                 -
                   - /var/lib/kolla/config_files/glance_api.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/glance_api:/var/lib/kolla/config_files/src:ro
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - /var/lib/glance:/var/lib/glance:slave
                 -
@@ -575,7 +575,7 @@ outputs:
                         - {get_attr: [GlanceLogging, volumes]}
                         -
                           - /var/lib/kolla/config_files/glance_api_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                          - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro
+                          - /var/lib/config-data/puppet-generated/glance_api:/var/lib/kolla/config_files/src:ro
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:

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

@@ -306,7 +306,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/gnocchi_db_sync.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro
                   - str_replace:
                       template: GNOCCHI_FILE_BASE_PATH:GNOCCHI_FILE_BASE_PATH:SE_FLAGS
                       params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}, SE_FLAGS: 'shared,z'}
@@ -331,7 +331,7 @@ outputs:
                       template: GNOCCHI_FILE_BASE_PATH:GNOCCHI_FILE_BASE_PATH:SE_FLAGS
                       params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}, SE_FLAGS: 'shared,z'}
                   - /var/lib/kolla/config_files/gnocchi_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi:z
                   - /var/log/containers/httpd/gnocchi-api:/var/log/httpd:z
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro

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

@@ -144,7 +144,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/gnocchi_metricd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi:z
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - str_replace:

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

@@ -136,7 +136,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/gnocchi_statsd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/gnocchi:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi:z
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - str_replace:

deployment/haproxy/haproxy-container-puppet.yaml

@@ -260,7 +260,7 @@ outputs:
                   - {get_attr: [HAProxyLogging, volumes]}
                   -
                     - /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro
-                    - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro
+                    - /var/lib/config-data/puppet-generated/haproxy:/var/lib/kolla/config_files/src:ro
                     - /var/lib/haproxy:/var/lib/haproxy:rw,z
                   - if:
                     - public_tls_enabled

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -252,7 +252,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/haproxy:/var/lib/kolla/config_files/src:ro
           haproxy_init_bundle:
             start_order: 3
             detach: false

deployment/heat/heat-api-cfn-container-puppet.yaml

@@ -197,7 +197,7 @@ outputs:
                 - {get_attr: [HeatApiCfnLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/heat_api_cfn/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/heat_api_cfn:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled

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

@@ -225,7 +225,7 @@ outputs:
                 - {get_param: HeatApiOptVolumes}
                 -
                   - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/heat_api:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled
@@ -254,7 +254,7 @@ outputs:
                 - {get_attr: [HeatApiLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/heat_api_cron.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/heat_api:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [HeatApiLogging, host_prep_tasks]}

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

@@ -275,7 +275,7 @@ outputs:
                 - {get_param: HeatEngineOptVolumes}
                 -
                   - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/heat/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/heat:/var/lib/kolla/config_files/src:ro
             environment:
               map_merge:
                 - {get_param: HeatEngineOptEnvVars}

deployment/horizon/horizon-container-puppet.yaml

@@ -270,7 +270,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/horizon.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/horizon/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/horizon:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/horizon:/var/log/horizon:z
                   - /var/log/containers/httpd/horizon:/var/log/httpd:z
                   - /var/tmp/:/var/tmp/:z

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

@@ -244,7 +244,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic_api/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic_api:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ironic:/var/log/ironic:z
                   - /var/log/containers/httpd/ironic-api:/var/log/httpd:z
                   -

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

@@ -532,7 +532,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro
                       - /lib/modules:/lib/modules:ro
                       - /sys:/sys
                       - /dev:/dev

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

@@ -447,7 +447,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_inspector.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic_inspector:/var/lib/kolla/config_files/src:ro
                   - /var/lib/ironic:/var/lib/ironic:shared,z
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
                   - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z
@@ -467,7 +467,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_inspector_dnsmasq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic_inspector:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
                   - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z
             environment:

deployment/ironic/ironic-neutron-agent-container-puppet.yaml

@@ -115,7 +115,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_neutron_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}

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

@@ -133,7 +133,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro
                   - /var/lib/ironic:/var/lib/ironic/:shared,z
                   - /var/log/containers/ironic:/var/log/ironic:z
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z
@@ -153,7 +153,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic:/var/lib/kolla/config_files/src:ro
                   - /var/lib/ironic:/var/lib/ironic/:shared,z
                   - /var/log/containers/ironic:/var/log/ironic:z
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z

deployment/keepalived/keepalived-container-puppet.yaml

@@ -122,7 +122,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/keepalived.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/keepalived/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/keepalived:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/keepalived/:/var/log/:z
                   - /lib/modules/:/lib/modules/:ro
                   - /var/lib/haproxy/:/var/lib/haproxy/:z

deployment/keystone/keystone-container-puppet.yaml

@@ -641,7 +641,7 @@ outputs:
                 - {get_attr: [KeystoneLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/keystone:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled

deployment/logging/rsyslog-container-puppet.yaml

@@ -209,7 +209,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rsyslog.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rsyslog/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rsyslog:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers:/var/log/containers:ro
                   - /var/log/containers/rsyslog:/var/log/rsyslog:rw,z
                   - /var/lib/rsyslog.container:/var/lib/rsyslog:rw,z

deployment/logging/stdout/haproxy.yaml

@@ -24,7 +24,7 @@ outputs:
           restart: always
           volumes:
             - /var/lib/kolla/config_files/rsyslog_sidecar.json:/var/lib/kolla/config_files/config.json:ro
-            - /var/lib/config-data/puppet-generated/rsyslog_sidecar/:/var/lib/kolla/config_files/src:ro
+            - /var/lib/config-data/puppet-generated/rsyslog_sidecar:/var/lib/kolla/config_files/src:ro
             - HAProxyLogs:/sockets/
           environment:
             KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/logrotate/logrotate-crond-container-puppet.yaml

@@ -151,7 +151,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/logrotate-crond.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/crond/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/crond:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers:/var/log/containers:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -219,7 +219,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/manila_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/manila:/var/log/manila:z
                   - /var/log/containers/httpd/manila-api:/var/log/httpd:z
                   - if:

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

@@ -98,7 +98,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/manila_scheduler.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/manila:/var/log/manila:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/manila/manila-share-common.yaml

@@ -56,7 +56,7 @@ outputs:
         - {get_attr: [ContainersCommon, volumes]}
         -
           - /var/lib/kolla/config_files/manila_share.json:/var/lib/kolla/config_files/config.json:ro
-          - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
+          - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro
           - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
           - /dev/:/dev/
           - /run/:/run/

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

@@ -153,7 +153,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/manila:/var/lib/kolla/config_files/src:ro
           manila_share_init_bundle:
             start_order: 1
             detach: false

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

@@ -137,7 +137,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/qdrouterd/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
                   - /var/lib/qdrouterd:/var/lib/qdrouterd:z
                   - /var/log/containers/qdrouterd:/var/log/qdrouterd:z
             environment:

deployment/metrics/collectd-container-puppet.yaml

@@ -628,7 +628,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/collectd:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/collectd:/var/log/collectd:rw,z
                   - /var/run/:/var/run:rw,z
                   - /var/log/journal:/var/log/journal:ro

deployment/metrics/qdr-container-puppet.yaml

@@ -286,7 +286,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/metrics-qdr.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/metrics-qdr/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/metrics-qdr:/var/lib/kolla/config_files/src:ro
                   - /var/lib/metrics-qdr:/var/lib/qdrouterd:z
                   - /var/log/containers/metrics-qdr:/var/log/qdrouterd:z
                 - if:

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

@@ -194,7 +194,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/mistral:/var/log/mistral:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -124,7 +124,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/mistral:/var/log/mistral:z
                   - /var/lib/mistral:/var/lib/mistral:ro
                   - /usr/share/ansible/:/usr/share/ansible/:ro

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

@@ -99,7 +99,7 @@ outputs:
                 -
                   - /run:/run
                   - /var/lib/kolla/config_files/mistral_event_engine.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/mistral:/var/log/mistral:z
                   - /var/lib/mistral:/var/lib/mistral:ro
                   - /usr/share/ansible/:/usr/share/ansible/:ro

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

@@ -167,7 +167,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/mistral:/var/lib/kolla/config_files/src:ro
                   - /run:/run
                   - /var/log/containers/mistral:/var/log/mistral:z
                   - /var/lib/mistral:/var/lib/mistral:z

deployment/multipathd/multipathd-container.yaml

@@ -123,7 +123,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/multipathd/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/multipathd:/var/lib/kolla/config_files/src:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /dev/:/dev/
                   - /run/:/run/

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

@@ -486,7 +486,7 @@ outputs:
                     - {get_param: NeutronApiOptVolumes}
                     -
                       - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                     - if:
                       - ovn_and_tls
                       -
@@ -510,7 +510,7 @@ outputs:
                         - {get_attr: [NeutronLogging, volumes]}
                         -
                           - /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                          - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                          - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:

deployment/neutron/neutron-dhcp-container-puppet.yaml

@@ -362,7 +362,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z
                   - /var/lib/neutron:/var/lib/neutron:shared,z

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -320,7 +320,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_l3_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z
                   - /var/lib/neutron:/var/lib/neutron:shared,z

deployment/neutron/neutron-metadata-container-puppet.yaml

@@ -189,7 +189,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /var/lib/neutron:/var/lib/neutron:shared,z
             environment:

deployment/neutron/neutron-mlnx-agent-container-puppet.yaml

@@ -166,7 +166,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_mlnx_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
                   - /var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron
@@ -188,7 +188,7 @@ outputs:
                 - {get_attr: [MlnxAgentLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_mlnx_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw
@@ -208,7 +208,7 @@ outputs:
                 - {get_attr: [EswitchdLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/eswitchd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -293,7 +293,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z
                   - /var/run/openvswitch/:/var/run/openvswitch/:shared,z
@@ -323,7 +323,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /var/lib/container-config-scripts/neutron_ovs_agent_launcher.sh:/neutron_ovs_agent_launcher.sh:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z

deployment/neutron/neutron-sriov-agent-container-puppet.yaml

@@ -192,7 +192,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/neutron_sriov_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw

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

@@ -381,7 +381,7 @@ outputs:
               list_concat:
                 - *nova_api_bootstrap_volumes
                 -
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
                   - /var/lib/container-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
             user: root
             command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
@@ -401,7 +401,7 @@ outputs:
                 - {get_attr: [NovaApiLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled
@@ -451,7 +451,7 @@ outputs:
                 - {get_attr: [NovaApiLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_api_cron.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:

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

@@ -699,7 +699,7 @@ outputs:
                     - {get_param: NovaComputeOptVolumes}
                     -
                       - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
                       - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                       - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                       - /dev:/dev

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

@@ -185,7 +185,7 @@ outputs:
                 - {get_attr: [NovaLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:

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

@@ -178,7 +178,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /run:/run
                   - /dev:/dev

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

@@ -652,7 +652,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_virtlogd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /dev:/dev
                   - /run:/run
@@ -690,7 +690,7 @@ outputs:
                 - {get_attr: [NovaLibvirtLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_libvirt.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                   - /lib/modules:/lib/modules:ro
                   - /dev:/dev

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

@@ -233,7 +233,7 @@ outputs:
                 - {get_attr: [NovaMetadataLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_metadata.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova_metadata/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova_metadata:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled

deployment/nova/nova-migration-target-container-puppet.yaml

@@ -159,7 +159,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
                   - /etc/ssh/:/host-ssh/:ro
                   - /run/libvirt:/run/libvirt
                 # podman fails to relable if nova_nfs_enabled where we have

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

@@ -182,7 +182,7 @@ outputs:
                 - {get_attr: [NovaLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
                   - /run:/run
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -251,7 +251,7 @@ outputs:
                 - {get_attr: [NovaLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_vnc_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/nova:/var/lib/kolla/config_files/src:ro
                 -
                   if:
                     - use_tls_for_vnc

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

@@ -297,7 +297,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/octavia_api.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/run/octavia:/var/run/octavia:shared,z
                       - /var/log/containers/httpd/octavia-api:/var/log/httpd:z
@@ -326,7 +326,7 @@ outputs:
                         - {get_attr: [ContainersCommon, volumes]}
                         -
                           - /var/lib/kolla/config_files/octavia_driver_agent.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/run/octavia:/var/run/octavia:shared,z
                     environment:

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

@@ -143,7 +143,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/octavia_health_manager.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
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -142,7 +142,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/octavia_housekeeping.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
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -129,7 +129,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/octavia_worker.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
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -314,7 +314,7 @@ outputs:
                 - {get_attr: [NeutronLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/ovn_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z
                   - /var/lib/neutron:/var/lib/neutron:shared,z

deployment/pacemaker/clustercheck-container-puppet.yaml

@@ -86,7 +86,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/puppet-generated/clustercheck/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/clustercheck:/var/lib/kolla/config_files/src:ro
                   - /var/lib/mysql:/var/lib/mysql
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -281,7 +281,7 @@ outputs:
                 - {get_attr: [PlacementLogging, volumes]}
                 -
                   - /var/lib/kolla/config_files/placement_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/placement/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/placement:/var/lib/kolla/config_files/src:ro
                   -
                     if:
                       - internal_tls_enabled

deployment/qdr/qdrouterd-container-puppet.yaml

@@ -127,7 +127,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/qdrouterd/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
                   - /var/lib/qdrouterd:/var/lib/qdrouterd:z
                   - /var/log/containers/qdrouterd:/var/log/qdrouterd:z
             environment:

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -268,7 +268,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq
                 - if:
@@ -302,7 +302,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq:z
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq:z
                 - if:

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

@@ -212,7 +212,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq:z
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq:z
                 - if:
@@ -247,7 +247,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq:z
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq:z
                 - if:

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

@@ -161,7 +161,7 @@ outputs:
             privileged: false
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
@@ -192,7 +192,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
           rabbitmq_init_bundle:
             start_order: 1
             detach: false

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

@@ -161,7 +161,7 @@ outputs:
             privileged: false
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
@@ -192,7 +192,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
           rabbitmq_init_bundle:
             start_order: 1
             detach: false

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

@@ -212,7 +212,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq:z
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq:z
                 - if:
@@ -247,7 +247,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
                   - /var/lib/rabbitmq:/var/lib/rabbitmq:z
                   - /var/log/containers/rabbitmq:/var/log/rabbitmq:z
                 - if:

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

@@ -161,7 +161,7 @@ outputs:
             privileged: false
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
@@ -193,7 +193,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
-                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
+                - - /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
           rabbitmq_init_bundle:
             start_order: 1
             detach: false

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

@@ -185,7 +185,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro
                   - /lib/modules:/lib/modules:ro
                   - /var/lib/sahara:/var/lib/sahara
                   - /var/log/containers/sahara:/var/log/sahara

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

@@ -115,7 +115,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/sahara-engine.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro
                   - /var/lib/sahara:/var/lib/sahara
                   - /var/log/containers/sahara:/var/log/sahara
             environment:

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

@@ -403,7 +403,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /run:/run
                       - /srv/node:/srv/node
                       - /dev:/dev
@@ -422,7 +422,7 @@ outputs:
                         - {get_attr: [ContainersCommon, volumes]}
                         -
                           - /var/lib/kolla/config_files/swift_proxy_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                          - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                          - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:

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

@@ -320,7 +320,7 @@ outputs:
             detach: false
             command: ['/bin/bash', '-c', 'sed -i "/pid file/d" /var/lib/kolla/config_files/src/etc/rsyncd.conf']
             volumes:
-              - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:rw,z
+              - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:rw,z
         step_4:
           map_merge:
             - if:
@@ -337,7 +337,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node:z
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift:z
@@ -354,7 +354,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift
@@ -370,7 +370,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift
@@ -386,7 +386,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift
@@ -403,7 +403,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift
@@ -419,7 +419,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift
@@ -436,7 +436,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node:z
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift:z
@@ -454,7 +454,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -470,7 +470,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -488,7 +488,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -504,7 +504,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -520,7 +520,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -538,7 +538,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift
@@ -555,7 +555,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/swift_rsync.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/log/containers/swift:/var/log/swift:z
@@ -574,7 +574,7 @@ outputs:
                       - {get_attr: [ContainersCommon, volumes]}
                       -
                         - /var/lib/kolla/config_files/swift_container_sharder.json:/var/lib/kolla/config_files/config.json:ro
-                        - /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
+                        - /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
                         - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift

deployment/zaqar/zaqar-container-puppet.yaml

@@ -327,7 +327,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/zaqar:/var/log/zaqar
                       - /var/log/containers/httpd/zaqar:/var/log/httpd
                       -
@@ -358,7 +358,7 @@ outputs:
                     - {get_attr: [ContainersCommon, volumes]}
                     -
                       - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
-                      - /var/lib/config-data/puppet-generated/zaqar/:/var/lib/kolla/config_files/src:ro
+                      - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/zaqar:/var/log/zaqar
                       - /var/log/containers/httpd/zaqar:/var/log/httpd
                 environment: