Convert container environment from a list to a dict

Moving all the container environments from lists to dicts, so they can
be consumed later by the podman_container ansible module which uses
dict.

Using a dict is also easier to parse, since it doesn't involve "=" for
each item in the environment to export.

Change-Id: I894f339cdf03bc2a93c588f826f738b0b851a3ad
Depends-On: I98c75e03d78885173d829fa850f35c52c625e6bb

common/container-puppet.py

@@ -479,9 +479,10 @@ for infile in infiles:
         config_hashes = filter(None, config_hashes)
         config_hash = '-'.join(config_hashes)
         if config_hash:
-            env = v.get('environment', [])
-            env.append("TRIPLEO_CONFIG_HASH=%s" % config_hash)
             log.debug("Updating config hash for %s, config_volume=%s hash=%s" % (k, config_volume, config_hash))
+            # When python 27 support is removed, we will be able to use z = {**x, **y} to merge the dicts.
+            v.get('environment', {}).update({'TRIPLEO_CONFIG_HASH': config_hash})
+            env = v.get('environment')
             infile_data[k]['environment'] = env
 
     outfile = os.path.join(os.path.dirname(infile), "hashed-" + os.path.basename(infile))

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

@@ -213,7 +213,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       - name: create persistent logs directory
         file:

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

@@ -106,7 +106,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -106,7 +106,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -106,7 +106,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -474,10 +474,7 @@ outputs:
                   environment:
                     # NOTE: this should force this container to re-run on each
                     # update (scale-out, etc.)
-                    - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
                   command:
                     list_join:
                       - ' '
@@ -515,10 +512,7 @@ outputs:
                   environment:
                     # NOTE: this should force this container to re-run on each
                     # update (scale-out, etc.)
-                    - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
                   command:
                     list_join:
                       - ' '
@@ -558,12 +552,7 @@ outputs:
                   user: root
                   volumes: *barbican_api_volumes
                   environment:
-                    # NOTE: this should force this container to re-run on each
-                    # update (scale-out, etc.)
-                    - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
                   command: "/usr/bin/bootstrap_host_exec barbican_api /opt/nfast/bin/rfs-sync --commit"
               - {}
             - if:
@@ -576,12 +565,7 @@ outputs:
                   user: root
                   volumes: *barbican_api_volumes
                   environment:
-                    # NOTE: this should force this container to re-run on each
-                    # update (scale-out, etc.)
-                    - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
                   command: "/opt/nfast/bin/rfs-sync --update"
               - {}
             - barbican_api_db_sync:
@@ -630,10 +614,7 @@ outputs:
                   environment:
                     # NOTE: this should force this container to re-run on each
                     # update (scale-out, etc.)
-                    - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
                   command:
                     list_join:
                       - ' '
@@ -681,7 +662,7 @@ outputs:
                           - /usr/lib64/libnethsm.so:/usr/lib64/libnethsm.so
                         - null
                 environment: &kolla_env
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - barbican_keystone_listener:
                 start_order: 6
                 image: {get_param: ContainerBarbicanKeystoneListenerImage}

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

@@ -124,7 +124,7 @@ outputs:
                   - /dev:/dev
                   - /run:/run
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -122,7 +122,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_5:
           ceilometer_gnocchi_upgrade:
             start_order: 99

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

@@ -111,7 +111,7 @@ outputs:
                   - /var/run/libvirt:/var/run/libvirt:ro
                   - /var/log/containers/ceilometer:/var/log/ceilometer:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -129,7 +129,7 @@ outputs:
                   - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -116,7 +116,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -301,7 +301,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           cinder_api_cron:
             image: *cinder_api_image
             net: host
@@ -319,7 +319,7 @@ outputs:
                   - /var/log/containers/cinder:/var/log/cinder:z
                   - /var/log/containers/httpd/cinder-api:/var/log/httpd:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:
         # Create the default volume type after the cinder-api service is
         # running. The puppet code will ensure this is only done once, on

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

@@ -179,7 +179,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh openstack-cinder-backup cinder_backup
             image: {get_param: ContainerCinderBackupImage}
             volumes:
@@ -213,10 +213,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks: {get_attr: [CinderCommon, cinder_backup_host_prep_tasks]}
       deploy_steps_tasks:
         - name: Cinder Backup tag container image for pacemaker

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

@@ -37,9 +37,9 @@ parameters:
     description: list of optional volumes to be mounted
     type: comma_delimited_list
   CinderVolumeOptEnvVars:
-    default: []
-    description: list of optional environment variables
-    type: comma_delimited_list
+    default: {}
+    description: hash of optional environment variables
+    type: json
   CinderEnableIscsiBackend:
     default: true
     description: Whether to enable or not the Iscsi backend for Cinder
@@ -178,10 +178,9 @@ outputs:
   cinder_volume_environment:
     description: Docker environment for the cinder-volume container (HA or non-HA)
     value:
-      list_concat:
+      map_merge:
         - {get_param: CinderVolumeOptEnvVars}
-        -
-          - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+        - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
 
   cinder_backup_host_prep_tasks:
     description: Host prep tasks for the cinder-backup service (HA or non-HA)
@@ -213,4 +212,4 @@ outputs:
   cinder_backup_environment:
     description: Docker environment for the cinder-backup container (HA or non-HA)
     value:
-      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -127,7 +127,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -164,7 +164,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh openstack-cinder-volume cinder_volume
             image: {get_param: ContainerCinderVolumeImage}
             volumes:
@@ -198,10 +198,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks: {get_attr: [CinderCommon, cinder_volume_host_prep_tasks]}
       deploy_steps_tasks:
         - name: Cinder Volume tag container image for pacemaker

deployment/database/mysql-container-puppet.yaml

@@ -175,20 +175,16 @@ outputs:
                   - /etc/pki/tls/private/mysql.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/mysql.key:ro
                 - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              - DB_MAX_TIMEOUT=60
-              -
-                list_join:
-                  - '='
-                  - - 'DB_ROOT_PASSWORD'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: MysqlRootPassword}
-                            - {get_param: [DefaultPasswords, mysql_root_password]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              DB_MAX_TIMEOUT: 60
+              DB_ROOT_PASSWORD:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: MysqlRootPassword}
+                      - {get_param: [DefaultPasswords, mysql_root_password]}
           mysql:
             start_order: 2
             stop_grace_period: 60
@@ -199,7 +195,7 @@ outputs:
               test: /openstack/healthcheck
             volumes: *mysql_volumes
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_3:
           # sync credentials config on the running container if it was
           # changed by the docker_puppet_task during step 2
@@ -211,7 +207,7 @@ outputs:
             command:
               [ 'mysql', '/bin/bash', '-c', 'cp /var/lib/kolla/config_files/src/root/.my.cnf /root' ]
             environment:
-              - KOLLA_BOOTSTRAP=True
+              KOLLA_BOOTSTRAP: true
       container_puppet_tasks:
         # MySQL database initialization occurs only on single node
         step_2:

deployment/database/mysql-pacemaker-puppet.yaml

@@ -237,25 +237,17 @@ outputs:
                   - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
                   - /var/lib/mysql:/var/lib/mysql
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              - DB_MAX_TIMEOUT=60
-              -
-                list_join:
-                  - '='
-                  - - 'DB_CLUSTERCHECK_PASSWORD'
-                    - {get_param: MysqlClustercheckPassword}
-              -
-                list_join:
-                  - '='
-                  - - 'DB_ROOT_PASSWORD'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: MysqlRootPassword}
-                            - {get_param: [DefaultPasswords, mysql_root_password]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              DB_MAX_TIMEOUT: 60
+              DB_CLUSTERCHECK_PASSWORD: {get_param: MysqlClustercheckPassword}
+              DB_ROOT_PASSWORD:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: MysqlRootPassword}
+                      - {get_param: [DefaultPasswords, mysql_root_password]}
         step_2:
           mysql_restart_bundle:
             start_order: 0
@@ -265,7 +257,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh galera-bundle mysql
             image: {get_param: ContainerMysqlImage}
             volumes:
@@ -301,10 +293,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/database/redis-container-puppet.yaml

@@ -180,7 +180,7 @@ outputs:
                   - /var/log/containers/redis:/var/log/redis:z
                   - /var/run/redis:/var/run/redis:z
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - if:
                 - internal_tls_enabled
                 - redis_tls_proxy:
@@ -200,7 +200,7 @@ outputs:
                           - /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:
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
       metadata_settings:
         if:

deployment/database/redis-pacemaker-puppet.yaml

@@ -213,7 +213,7 @@ outputs:
                 ipc: host
                 user: root
                 environment:
-                  - TRIPLEO_MINOR_UPDATE
+                  TRIPLEO_MINOR_UPDATE: ''
                 command: /pacemaker_restart_bundle.sh redis-bundle redis
                 image: {get_param: ContainerRedisConfigImage}
                 volumes:
@@ -248,10 +248,7 @@ outputs:
                 environment:
                   # NOTE: this should force this container to re-run on each
                   # update (scale-out, etc.)
-                  - list_join:
-                      - ''
-                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                        - {get_param: DeployIdentifier}
+                  TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
             - if:
                 - internal_tls_enabled
                 - redis_tls_proxy:
@@ -269,7 +266,7 @@ outputs:
                           - /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:
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
       metadata_settings:
         get_attr: [RedisBase, role_data, metadata_settings]

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

@@ -303,7 +303,7 @@ outputs:
                       - /var/lib/config-data/puppet-generated/ec2_api/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/ec2_api:/var/log/ec2api:z
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
               ec2_api_metadata:
                 image: *ec2_api_image
                 net: host
@@ -317,7 +317,7 @@ outputs:
                       - /var/lib/config-data/puppet-generated/ec2_api/:/var/lib/kolla/config_files/src:ro
                       - /var/log/containers/ec2_api_metadata:/var/log/ec2api:z
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - if:
                 - internal_tls_enabled
                 - ec2_api_tls_proxy:
@@ -334,7 +334,7 @@ outputs:
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
       host_prep_tasks:
         - name: create persistent log directories

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

@@ -228,7 +228,7 @@ outputs:
                   - /var/lib/opendaylight/journal:/opt/opendaylight/journal
                   - /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         if:
           - internal_tls_enabled

deployment/etcd/etcd-container-puppet.yaml

@@ -140,7 +140,7 @@ outputs:
               - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:
         # Etcd keys initialization occurs only on single node
         step_2:

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

@@ -152,7 +152,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -172,7 +172,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_5:
           designate_pool_manage:
             image: *designate_central_image

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

@@ -152,7 +152,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -125,7 +125,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -117,7 +117,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -202,7 +202,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           designate_backend_bind9:
             image: {get_param: ContainerDesignateBackendBIND9Image}
             net: host
@@ -218,7 +218,7 @@ outputs:
                   - /var/log/containers/designate:/var/log/designate:z
                   - /var/named-persistent:/var/named-persistent:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -529,8 +529,8 @@ outputs:
                       - /etc/multipath.conf:/etc/multipath.conf:ro
                     - []
             environment:
-              - KOLLA_BOOTSTRAP=True
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command: "/usr/bin/bootstrap_host_exec glance_api su glance -s /bin/bash -c '/usr/local/bin/kolla_start'"
         step_4:
           map_merge:
@@ -544,7 +544,7 @@ outputs:
                   test: /openstack/healthcheck
                 volumes: *glance_volumes
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - if:
                 - internal_tls_enabled
                 - glance_api_tls_proxy:
@@ -562,7 +562,7 @@ outputs:
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
       host_prep_tasks:
         list_concat:

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

@@ -314,7 +314,7 @@ outputs:
                   - /var/log/containers/httpd/gnocchi-api:/var/log/httpd:z
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           gnocchi_api:
             image: *gnocchi_api_image
             start_order: 1
@@ -346,7 +346,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent data and logs directory
           file:

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

@@ -151,7 +151,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'}
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -145,7 +145,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'}
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/haproxy/haproxy-container-puppet.yaml

@@ -284,7 +284,7 @@ outputs:
                             - 'ro'
                     - null
               environment:
-                - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:
         - name: Run puppet on the host to apply IPtables rules
           when: step|int == 1

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -246,7 +246,7 @@ outputs:
             user: root
             config_volume: haproxy
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh haproxy-bundle haproxy
             image: {get_param: ContainerHAProxyImage}
             volumes:
@@ -284,10 +284,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
         - name: Check if rsyslog exists

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

@@ -209,7 +209,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [HeatApiCfnLogging, host_prep_tasks]}
       upgrade_tasks: []
       metadata_settings:

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

@@ -50,9 +50,9 @@ parameters:
     description: list of optional volumes to be mounted
     type: comma_delimited_list
   HeatApiOptEnvVars:
-    default: []
-    description: list of optional environment variables
-    type: comma_delimited_list
+    default: {}
+    description: hash of optional environment variables
+    type: json
   HeatWorkers:
     default: 0
     description: Number of workers for Heat service.
@@ -237,10 +237,9 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-                  list_concat:
-                    - {get_param: HeatApiOptEnvVars}
-                    -
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              map_merge:
+                - {get_param: HeatApiOptEnvVars}
+                - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           heat_api_cron:
             image: {get_param: ContainerHeatApiImage}
             net: host
@@ -257,7 +256,7 @@ outputs:
                   - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [HeatApiLogging, host_prep_tasks]}
       upgrade_tasks: []
       metadata_settings:

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

@@ -46,9 +46,9 @@ parameters:
     description: list of optional volumes to be mounted
     type: comma_delimited_list
   HeatEngineOptEnvVars:
-    default: []
-    description: list of optional environment variables
-    type: comma_delimited_list
+    default: {}
+    description: hash of optional environment variables
+    type: json
   HeatEnableDBPurge:
     type: boolean
     default: true
@@ -261,10 +261,9 @@ outputs:
                   - /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
             environment:
-                  list_concat:
-                    - {get_param: HeatEngineOptEnvVars}
-                    -
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              map_merge:
+                - {get_param: HeatEngineOptEnvVars}
+                - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         list_concat:
           - {get_attr: [HeatEngineLogging, host_prep_tasks]}

deployment/horizon/horizon-container-puppet.yaml

@@ -286,32 +286,32 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
               # Installed plugins:
-              - ENABLE_CLOUDKITTY=no
-              - ENABLE_IRONIC=yes
-              - ENABLE_MAGNUM=no
-              - ENABLE_MANILA=yes
-              - ENABLE_HEAT=yes
+              ENABLE_CLOUDKITTY: no
+              ENABLE_IRONIC: yes
+              ENABLE_MAGNUM: no
+              ENABLE_MANILA: yes
+              ENABLE_HEAT: yes
               # murano depends on heat-dashboard that is not yet installed
               # https://bugs.launchpad.net/tripleo/+bug/1752132
-              - ENABLE_MURANO=no
-              - ENABLE_MISTRAL=yes
-              - ENABLE_OCTAVIA=yes
-              - ENABLE_SAHARA=yes
-              - ENABLE_TROVE=no
+              ENABLE_MURANO: no
+              ENABLE_MISTRAL: yes
+              ENABLE_OCTAVIA: yes
+              ENABLE_SAHARA: yes
+              ENABLE_TROVE: no
               # Not installed:
-              - ENABLE_FREEZER=no
-              - ENABLE_FWAAS=no
-              - ENABLE_KARBOR=no
-              - ENABLE_DESIGNATE=no
-              - ENABLE_SEARCHLIGHT=no
-              - ENABLE_SENLIN=no
-              - ENABLE_SOLUM=no
-              - ENABLE_TACKER=no
-              - ENABLE_WATCHER=no
-              - ENABLE_ZAQAR=no
-              - ENABLE_ZUN=no
+              ENABLE_FREEZER: no
+              ENABLE_FWAAS: no
+              ENABLE_KARBOR: no
+              ENABLE_DESIGNATE: no
+              ENABLE_SEARCHLIGHT: no
+              ENABLE_SENLIN: no
+              ENABLE_SOLUM: no
+              ENABLE_TACKER: no
+              ENABLE_WATCHER: no
+              ENABLE_ZAQAR: no
+              ENABLE_ZUN: no
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -259,7 +259,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -540,7 +540,7 @@ outputs:
                       - /var/lib/ironic:/var/lib/ironic:z
                       - /var/log/containers/ironic:/var/log/ironic:z
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: load iscsi_tcp module
           import_role:

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

@@ -390,7 +390,7 @@ outputs:
                   - /var/lib/config-data/ironic_inspector/etc/ironic-inspector:/etc/ironic-inspector:ro
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command: "/usr/bin/bootstrap_host_exec ironic_inspector su ironic-inspector -s /bin/bash -c 'ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade'"
           ironic_inspector_get_ipa:
             start_order: 2
@@ -406,7 +406,7 @@ outputs:
                   - /var/lib/kolla/config_files/ironic_inspector.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/ironic:/var/lib/ironic:shared,z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command:
               if:
                - ipa_images
@@ -436,7 +436,7 @@ outputs:
                   - /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:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           ironic_inspector_dnsmasq:
             start_order: 93
             image: *ironic_inspector_image
@@ -455,7 +455,7 @@ outputs:
                   - /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:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -116,7 +116,7 @@ outputs:
                   - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       upgrade_tasks: []
       post_upgrade_tasks:

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

@@ -125,7 +125,7 @@ outputs:
                   - /var/log/containers/ironic:/var/log/ironic:z
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           ironic_pxe_http:
             start_order: 91
             image: *ironic_pxe_image
@@ -145,7 +145,7 @@ outputs:
                   - /var/log/containers/ironic:/var/log/ironic:z
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/iscsid/iscsid-container-puppet.yaml

@@ -93,7 +93,7 @@ outputs:
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /var/lib/iscsi:/var/lib/iscsi:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: ensure /etc/iscsi exists
           file:

deployment/keepalived/keepalived-container-puppet.yaml

@@ -127,7 +127,7 @@ outputs:
                   - /lib/modules/:/lib/modules/:ro
                   - /var/lib/haproxy/:/var/lib/haproxy/:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command: /usr/local/bin/kolla_start
       host_prep_tasks:
         - name: Set fact for restarting Keepalived container

deployment/keystone/keystone-container-puppet.yaml

@@ -643,10 +643,10 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              list_concat:
-              - - KOLLA_BOOTSTRAP=True
-                - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - {get_attr: [KeystoneLogging, environment]}
+              map_merge:
+                - {get_attr: [KeystoneLogging, environment]}
+                - KOLLA_BOOTSTRAP: true
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             command: ['/usr/bin/bootstrap_host_exec', 'keystone', '/usr/local/bin/kolla_start']
           keystone:
             start_order: 2
@@ -658,7 +658,7 @@ outputs:
               test: /openstack/healthcheck
             volumes: *keystone_volumes
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           keystone_bootstrap:
             start_order: 3
             action: exec
@@ -666,7 +666,7 @@ outputs:
             command:
               [ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ]
             environment:
-              - KOLLA_BOOTSTRAP=True
+              KOLLA_BOOTSTRAP: true
         step_4:
           # There are cases where we need to refresh keystone after the resource provisioning,
           # such as the case of using LDAP backends for domains. So we trigger a graceful

deployment/logging/files/nova-api.yaml

@@ -38,10 +38,7 @@ outputs:
           environment:
             # NOTE: this should force this container to re-run on each
             # update (scale-out, etc.)
-            - list_join:
-                - ''
-                - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                  - {get_param: DeployIdentifier}
+            TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:

deployment/logging/files/nova-common.yaml

@@ -56,10 +56,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         - keys:
             CONTAINERNAME: {get_attr: [InitLogContainerName, value]}
   host_prep_tasks:

deployment/logging/rsyslog-container-puppet.yaml

@@ -214,7 +214,7 @@ outputs:
                   - /var/log/containers/rsyslog:/var/log/rsyslog:rw,z
                   - /var/lib/rsyslog.container:/var/lib/rsyslog:rw,z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent logs directory for rsyslog
           file:

deployment/logging/stdout/haproxy.yaml

@@ -27,7 +27,7 @@ outputs:
             - /var/lib/config-data/puppet-generated/rsyslog_sidecar/:/var/lib/kolla/config_files/src:ro
             - HAProxyLogs:/sockets/
           environment:
-            - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+            KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:

deployment/logging/stdout/keystone.yaml

@@ -54,7 +54,7 @@ outputs:
   environment:
     description: Extra environment variables needed for the service to log to stdout.
     value:
-      - EXTRA_KEYSTONE_MANAGE_ARGS=--log-dir= --log-file=
+      EXTRA_KEYSTONE_MANAGE_ARGS: '--log-dir= --log-file='
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:

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

@@ -154,7 +154,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

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

@@ -231,7 +231,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       host_prep_tasks:

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

@@ -101,7 +101,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/manila/manila-share-common.yaml

@@ -74,4 +74,4 @@ outputs:
   manila_share_environment:
     description: Docker environment for the manila-share container (HA or non-HA)
     value:
-      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

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

@@ -147,7 +147,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh openstack-manila-share manila_share
             image: {get_param: ContainerManilaShareImage}
             volumes:
@@ -181,10 +181,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -142,7 +142,7 @@ outputs:
                   - /var/lib/qdrouterd:/var/lib/qdrouterd:z
                   - /var/log/containers/qdrouterd:/var/log/qdrouterd:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       - name: create persistent logs directory
         file:

deployment/metrics/collectd-container-puppet.yaml

@@ -608,7 +608,7 @@ outputs:
                   - /sys/fs/cgroup:/sys/fs/cgroup:ro
                   - /usr/lib/systemd/system:/usr/lib/systemd/system:ro
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/metrics/qdr-container-puppet.yaml

@@ -289,7 +289,7 @@ outputs:
                         - 'ro'
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent logs directory
           file:

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

@@ -197,7 +197,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_5:
           mistral_db_populate:
             start_order: 1

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

@@ -130,7 +130,7 @@ outputs:
                   - /usr/share/ansible/:/usr/share/ansible/:ro
                   - /usr/share/openstack-tripleo-validations:/usr/share/openstack-tripleo-validations:ro
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -105,7 +105,7 @@ outputs:
                   - /usr/share/ansible/:/usr/share/ansible/:ro
                   - /usr/share/openstack-tripleo-validations:/usr/share/openstack-tripleo-validations:ro
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -202,7 +202,7 @@ outputs:
 
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             env_file: /etc/environment
       host_prep_tasks:
         - set_fact:

deployment/multipathd/multipathd-container.yaml

@@ -132,7 +132,7 @@ outputs:
                   - /var/lib/iscsi:/var/lib/iscsi:z
                   - /etc/multipath:/etc/multipath:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: Check if multipathd is deployed on the host
           command: systemctl is-enabled --quiet multipathd

deployment/neutron/neutron-agents-ib-config-container-puppet.yaml

@@ -115,7 +115,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron
                   - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       upgrade_tasks: []

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

@@ -49,9 +49,9 @@ parameters:
     description: list of optional volumes to be mounted
     type: comma_delimited_list
   NeutronApiOptEnvVars:
-    default: []
-    description: list of optional environment variables
-    type: comma_delimited_list
+    default: {}
+    description: hash of optional environment variables
+    type: json
   NeutronWorkers:
     default: ''
     description: |
@@ -473,10 +473,9 @@ outputs:
                         - /etc/pki/tls/private/ovn_neutron_client.key:/etc/pki/tls/private/ovn_neutron_client.key
                       - null
                 environment:
-                  list_concat:
+                  map_merge:
                     - {get_param: NeutronApiOptEnvVars}
-                    -
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                    - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - if:
                 - internal_tls_enabled
                 - neutron_server_tls_proxy:
@@ -493,7 +492,7 @@ outputs:
                           - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                     environment:
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                      KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       metadata_settings:

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

@@ -403,7 +403,7 @@ outputs:
                           - 'ro'
                     - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         if:
           - internal_tls_enabled

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

@@ -355,7 +355,7 @@ outputs:
                     - - /var/lib/neutron/dibbler_wrapper:/usr/local/bin/dibbler_client:ro
                     - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       host_prep_tasks:

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

@@ -193,7 +193,7 @@ outputs:
                   - /lib/modules:/lib/modules:ro
                   - /var/lib/neutron:/var/lib/neutron:shared,z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       host_prep_tasks:

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

@@ -172,7 +172,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron
                   - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_4:
           neutron_mlnx_agent:
             start_order: 10
@@ -193,7 +193,7 @@ outputs:
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           eswitchd:
             start_order: 10
             image: {get_param: ContainerNeutronMlnxImage}
@@ -213,7 +213,7 @@ outputs:
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       upgrade_tasks: []

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

@@ -303,7 +303,7 @@ outputs:
                       - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_4:
           neutron_ovs_agent:
             start_order: 10
@@ -328,7 +328,7 @@ outputs:
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch:shared,z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       host_prep_tasks:

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

@@ -182,7 +182,7 @@ outputs:
                   - /run:/run
                   - /sys/class/net:/sys/class/net:rw
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         list_concat:
           - {get_attr: [NeutronLogging, host_prep_tasks]}

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

@@ -413,7 +413,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           nova_wait_for_api_service:
             start_order: 3
             image: *nova_api_image
@@ -431,13 +431,11 @@ outputs:
                   - /var/lib/container-config-scripts/:/container-config-scripts/:z
             command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/container-config-scripts/pyshim.sh /container-config-scripts/nova_wait_for_api_service.py'"
             environment:
-              - list_join:
-                  - ''
-                  - - '__OS_DEBUG='
-                    - yaql:
-                        expression: str($.data.debug)
-                        data:
-                          debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
+              __OS_DEBUG:
+                yaql:
+                  expression: str($.data.debug)
+                  data:
+                    debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
           nova_api_cron:
             start_order: 4
             image: *nova_api_image
@@ -455,7 +453,7 @@ outputs:
                   - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       deploy_steps_tasks:

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

@@ -62,9 +62,9 @@ parameters:
     description: list of optional vo
     type: comma_delimited_list
   NovaComputeOptEnvVars:
-    default: []
-    description: list of optional en
-    type: comma_delimited_list
+    default: {}
+    description: hash of optional en
+    type: json
   EnableInstanceHA:
     default: false
     description: Whether to enable an Instance Ha configurarion or not.
@@ -643,17 +643,12 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
-              - list_join:
-                  - ''
-                  - - '__OS_DEBUG='
-                    - yaql:
-                        expression: str($.data.debug)
-                        data:
-                          debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
+              __OS_DEBUG:
+                yaql:
+                  expression: str($.data.debug)
+                  data:
+                    debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
         step_5:
           map_merge:
             - nova_compute:
@@ -699,10 +694,9 @@ outputs:
                         - /etc/multipath.conf:/etc/multipath.conf:ro
                       - []
                 environment:
-                  list_concat:
+                  map_merge:
                     - {get_param: NovaComputeOptEnvVars}
-                    -
-                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                    - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             - if:
                 - is_not_additional_cell
                 - nova_wait_for_compute_service:
@@ -721,13 +715,11 @@ outputs:
                     user: nova
                     command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_wait_for_compute_service.py"
                     environment:
-                      - list_join:
-                          - ''
-                          - - '__OS_DEBUG='
-                            - yaql:
-                                expression: str($.data.debug)
-                                data:
-                                  debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
+                      __OS_DEBUG:
+                        yaql:
+                          expression: str($.data.debug)
+                          data:
+                            debug: {get_attr: [NovaBase, role_data, config_settings, 'nova::logging::debug']}
                 - {}
       host_prep_tasks:
         list_concat:

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

@@ -187,7 +187,7 @@ outputs:
                   - /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
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:
         - name: validate nova conductor container state
           when:

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

@@ -187,7 +187,7 @@ outputs:
                     - /etc/multipath.conf:/etc/multipath.conf:ro
                   - []
             environment:
-             - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+             KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           nova_wait_for_compute_service:
             start_order: 101
             image: *nova_ironic_image

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

@@ -667,7 +667,7 @@ outputs:
                   - - /var/lib/nova:/var/lib/nova:shared
                   - - /var/lib/nova:/var/lib/nova:shared,z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           nova_libvirt:
             start_order: 1
             image: {get_param: ContainerNovaLibvirtImage}
@@ -766,7 +766,7 @@ outputs:
                       - /etc/pki/libvirt-nbd:/var/lib/kolla/config_files/src-libvirt-nbd-pki:ro
                     - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
         step_4:
           if:
             - need_libvirt_secret

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

@@ -245,7 +245,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:
         - name: validate nova metadata container state
           when:

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

@@ -170,7 +170,7 @@ outputs:
                   - - /var/lib/nova:/var/lib/nova:shared
                   - - /var/lib/nova:/var/lib/nova:shared,z
             environment:
-             - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:
         - name: validate nova migration target container state
           when:

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

@@ -185,7 +185,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
                   - /run:/run
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       deploy_steps_tasks:
         - name: validate nova scheduler container state
           when:

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

@@ -270,7 +270,7 @@ outputs:
                       - /etc/pki/tls/private/novnc_proxy.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/novnc_proxy.key:ro
                     - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         if:
           - use_tls_for_vnc

deployment/nova/novajoin-container-puppet.yaml

@@ -188,8 +188,8 @@ outputs:
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
                   - /var/log/containers/novajoin:/var/log/novajoin
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KRB5_CONFIG=/etc/novajoin/krb5.conf
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KRB5_CONFIG: /etc/novajoin/krb5.conf
           novajoin_notifier:
             start_order: 1
             image: {get_param: ContainerNovajoinNotifierImage}
@@ -206,8 +206,8 @@ outputs:
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
                   - /var/log/containers/novajoin:/var/log/novajoin
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KRB5_CONFIG=/etc/novajoin/krb5.conf
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KRB5_CONFIG: /etc/novajoin/krb5.conf
       host_prep_tasks:
         # https://bugs.launchpad.net/tripleo/+bug/1821139
         # This is here only for split stack environments to make sure

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

@@ -288,7 +288,7 @@ outputs:
                           - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                           - ''
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -146,7 +146,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -145,7 +145,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -132,7 +132,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -258,7 +258,7 @@ outputs:
                     - /etc/pki/tls/private/ovn_controller.key:/etc/pki/tls/private/ovn_controller.key
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -154,7 +154,7 @@ outputs:
                   - /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
                   - /var/log/containers/openvswitch:/var/log/openvswitch:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           ovn_south_db_server:
             start_order: 0
             image: {get_param: ContainerOvnSbDbImage}
@@ -171,7 +171,7 @@ outputs:
                   - /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
                   - /var/log/containers/openvswitch:/var/log/openvswitch:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           configure_ovn_north_db_server:
             start_order: 1
             action: exec
@@ -199,7 +199,7 @@ outputs:
                   - /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
                   - /var/log/containers/openvswitch:/var/log/openvswitch:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -181,7 +181,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh ovn-dbs-bundle ovn_dbs
             image: {get_param: ContainerOvnDbsConfigImage}
             volumes:
@@ -227,10 +227,7 @@ outputs:
             environment:
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -337,7 +337,7 @@ outputs:
                     - /etc/pki/tls/private/ovn_metadata.key:/etc/pki/tls/private/ovn_metadata.key
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       metadata_settings:
         list_concat:
           - {get_attr: [NeutronBase, role_data, metadata_settings]}

deployment/pacemaker/clustercheck-container-puppet.yaml

@@ -92,7 +92,7 @@ outputs:
                   - /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
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       upgrade_tasks:
       update_tasks:

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

@@ -218,24 +218,12 @@ outputs:
                   - /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
             environment:
-              - PLACEMENT_USER=placement
-              - NOVA_API_USER=nova_api
-              - list_join:
-                  - '='
-                  - - 'PLACEMENT_DB_HOST'
-                    - {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-              - list_join:
-                  - '='
-                  -  - 'PLACEMENT_PASS'
-                     - {get_param: PlacementPassword}
-              - list_join:
-                  - '='
-                  -  - 'NOVA_API_DB_HOST'
-                     - {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-              - list_join:
-                  - '='
-                  -  - 'NOVA_API_PASS'
-                     - {get_param: NovaPassword}
+              PLACEMENT_USER: placement
+              NOVA_API_USER: nova_api
+              PLACEMENT_DB_HOST: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+              PLACEMENT_PASS: {get_param: PlacementPassword}
+              NOVA_API_DB_HOST: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+              NOVA_API_PASS: {get_param: NovaPassword}
             # NOTE(lyarwood): We can swallow return codes of 0, 3, 4, 5 as they
             # suggest this is a fresh deployment with no data to extract
             # (or that placemant is being deployed without nova). The
@@ -289,7 +277,7 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
             placement_wait_for_service:
               start_order: 2
               image: *placement_api_image
@@ -302,13 +290,11 @@ outputs:
                 - /var/lib/config-data/puppet-generated/placement/:/var/lib/kolla/config_files/src:ro
               command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c '/container-config-scripts/pyshim.sh /container-config-scripts/placement_wait_for_service.py'"
               environment:
-                - list_join:
-                    - ''
-                    - - '__OS_DEBUG='
-                      - yaql:
-                          expression: str($.data.debug)
-                          data:
-                            debug: {get_param: Debug}
+                __OS_DEBUG:
+                  yaql:
+                    expression: str($.data.debug)
+                    data:
+                      debug: {get_param: Debug}
       host_prep_tasks: {get_attr: [PlacementLogging, host_prep_tasks]}
       upgrade_tasks: []
       post_upgrade_tasks:

deployment/qdr/qdrouterd-container-puppet.yaml

@@ -131,7 +131,7 @@ outputs:
                   - /var/lib/qdrouterd:/var/lib/qdrouterd:z
                   - /var/log/containers/qdrouterd:/var/log/qdrouterd:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks:
       - name: create persistent directories
         file:

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -283,19 +283,17 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
           rabbitmq:
             start_order: 2
             image: *rabbitmq_image
@@ -324,7 +322,7 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:
         # RabbitMQ users and policies initialization occurs only on single node
         step_2:

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

@@ -227,19 +227,17 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
           rabbitmq:
             start_order: 2
             stop_grace_period: 60
@@ -269,7 +267,7 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:
         # RabbitMQ users and policies initialization occurs only on single node
         step_2:

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

@@ -166,19 +166,17 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
         step_2:
           rabbitmq_restart_bundle:
             start_order: 0
@@ -188,7 +186,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh rabbitmq-bundle oslo_messaging_notify
             image: {get_param: ContainerRabbitmqImage}
             volumes:
@@ -222,14 +220,11 @@ outputs:
                   - null
             environment:
               # https://launchpad.net/bugs/1822673 (lang/lc_all to utf-8 are an elixir requirement)
-              - 'LANG=en_US.UTF-8'
-              - 'LC_ALL=en_US.UTF-8'
+              LANG: 'en_US.UTF-8'
+              LC_ALL: 'en_US.UTF-8'
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -166,19 +166,17 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
         step_2:
           rabbitmq_restart_bundle:
             start_order: 0
@@ -188,7 +186,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh rabbitmq-bundle rabbitmq
             image: {get_param: ContainerRabbitmqImage}
             volumes:
@@ -222,14 +220,11 @@ outputs:
                   - null
             environment:
               # https://launchpad.net/bugs/1822673 (lang/lc_all to utf-8 are an elixir requirement)
-              - 'LANG=en_US.UTF-8'
-              - 'LC_ALL=en_US.UTF-8'
+              LANG: 'en_US.UTF-8'
+              LC_ALL: 'en_US.UTF-8'
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

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

@@ -227,19 +227,17 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
           rabbitmq:
             start_order: 2
             stop_grace_period: 60
@@ -269,7 +267,7 @@ outputs:
                     - /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
                   - null
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       container_puppet_tasks:
         # RabbitMQ users and policies initialization occurs only on single node
         step_2:

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

@@ -166,19 +166,17 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq:z
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-              - KOLLA_BOOTSTRAP=True
-              -
-                list_join:
-                  - '='
-                  - - 'RABBITMQ_CLUSTER_COOKIE'
-                    -
-                      yaql:
-                        expression: $.data.passwords.where($ != '').first()
-                        data:
-                          passwords:
-                            - {get_param: RabbitCookie}
-                            - {get_param: [DefaultPasswords, rabbit_cookie]}
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
         step_2:
           rabbitmq_restart_bundle:
             start_order: 0
@@ -188,7 +186,7 @@ outputs:
             ipc: host
             user: root
             environment:
-              - TRIPLEO_MINOR_UPDATE
+              TRIPLEO_MINOR_UPDATE: ''
             command: /pacemaker_restart_bundle.sh rabbitmq-bundle oslo_messaging_rpc
             image: {get_param: ContainerRabbitmqImage}
             volumes:
@@ -221,15 +219,17 @@ outputs:
                   - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - null
             environment:
-              # https://launchpad.net/bugs/1822673 (lang/lc_all to utf-8 are an elixir requirement)
-              - 'LANG=en_US.UTF-8'
-              - 'LC_ALL=en_US.UTF-8'
+              KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
-              - list_join:
-                  - ''
-                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
-                    - {get_param: DeployIdentifier}
+              RABBITMQ_CLUSTER_COOKIE:
+                yaql:
+                  expression: $.data.passwords.where($ != '').first()
+                  data:
+                    passwords:
+                      - {get_param: RabbitCookie}
+                      - {get_param: [DefaultPasswords, rabbit_cookie]}
       metadata_settings:
         get_attr: [RabbitmqBase, role_data, metadata_settings]
       host_prep_tasks: