diff --git a/common/container-puppet.py b/common/container-puppet.py index 65338c14d7..1b9ec81fdf 100755 --- a/common/container-puppet.py +++ b/common/container-puppet.py @@ -479,9 +479,10 @@ def mp_puppet_config(*args): 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)) diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 892225e3a8..e24795132c 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index e192f3db71..db12e0289b 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index e5424c11b4..981707b533 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/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: diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 06b6316fb4..a3b42d8eec 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/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: diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 02bd98d564..306931f1f1 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/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} diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index d663148797..6d5b138139 100644 --- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 78a876ad99..bd92d63dbc 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/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 diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index cadff4b061..b606ecfa06 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 2e21744488..4443e44d52 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/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: diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index e6bae143aa..2d20330b3e 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/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: diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 4ec6dd81d8..438498490b 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index b26ad7d1fa..32d05acd1f 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index e623d8745d..58d4dc7cd0 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 846e42c346..daa78aa5a6 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/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: diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index a3c62d1593..412f50f81a 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index fe653d53ff..228000088b 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/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: diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 650289e903..c1908ab827 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 5c7342afa4..6a6e97632e 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/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: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index e0a9574f97..ed2c0f03ed 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/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] diff --git a/deployment/deprecated/ec2/ec2-api-container-puppet.yaml b/deployment/deprecated/ec2/ec2-api-container-puppet.yaml index 0b6f992684..09e9321608 100644 --- a/deployment/deprecated/ec2/ec2-api-container-puppet.yaml +++ b/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 diff --git a/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml b/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml index bd80357d8e..d51c92daac 100644 --- a/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml +++ b/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 diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index db506a8da8..c8ecb1b381 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 31d3f80e30..a140103565 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 80b543144a..6556960024 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/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 diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index ab1b897daa..b54256d1c5 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index f06abdf472..1dcdddf49b 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index fa941d5749..5b2474889d 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/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: diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index b7082e93be..976d99fe71 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/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: diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 0dc0884d76..fe8fb68ba2 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/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: diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 59801fdc86..e0f93b1a2b 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/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: diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index a30d80ca1a..1d97051259 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/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: diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 72bb408bb8..d8c217d32a 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/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: diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 88e9c5e7ab..caee6cb417 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/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 diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index f8e9af02b2..f8297e0d47 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 7d94655080..0f8b379c72 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/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: diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 537450df1b..e4ea1305ab 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/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: diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index a382b87263..5dea458409 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/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]} diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 4c9fabf93d..705b14d268 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 7c8009c986..4adecfdd67 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 5d8b0c5636..ea4fd10534 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index f30aec4f7c..66543298d2 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index fce5729edc..3c934fadbd 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/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: diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index b4b3752c30..0d1ad896e8 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/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: diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index 1a44eded2c..bff6b8b378 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/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: diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 4997561a87..22ce5081c8 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/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 diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index e486165250..deafc78ab5 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -637,10 +637,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 @@ -652,7 +652,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 @@ -660,7 +660,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 diff --git a/deployment/logging/files/nova-api.yaml b/deployment/logging/files/nova-api.yaml index 6a42717efd..a0f1e151c1 100644 --- a/deployment/logging/files/nova-api.yaml +++ b/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: diff --git a/deployment/logging/files/nova-common.yaml b/deployment/logging/files/nova-common.yaml index ccffd21aa4..593521e943 100644 --- a/deployment/logging/files/nova-common.yaml +++ b/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: diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index cc7feee6d5..8bf5b5df3f 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/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: diff --git a/deployment/logging/stdout/haproxy.yaml b/deployment/logging/stdout/haproxy.yaml index 225f96f476..a599c19917 100644 --- a/deployment/logging/stdout/haproxy.yaml +++ b/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: diff --git a/deployment/logging/stdout/keystone.yaml b/deployment/logging/stdout/keystone.yaml index 5c8c0fcdf1..f72790f64b 100644 --- a/deployment/logging/stdout/keystone.yaml +++ b/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: diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 7dff7ddb8b..f637ded3c2 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/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: diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index b3b174159a..297a1a6985 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/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: diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 0714703df1..08e4a495b7 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/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: diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 2713a5cbaa..324a0b0b6f 100644 --- a/deployment/manila/manila-share-common.yaml +++ b/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 diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index f86da1444f..80701468af 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index 3b9378006c..4473274e6f 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/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: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 97dcc36c60..a7f5827b42 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/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: diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index e2c3fe3a58..1ecb0b3316 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/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: diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 2fad546931..2f6496fcdb 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 03a5fc3a3f..897c112c93 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/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: diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index 0a63ebfa8a..2f5479d05f 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/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: diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index e3dbd3dce3..1da2b5935f 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/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: diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index beaf1727b9..618da40310 100644 --- a/deployment/multipathd/multipathd-container.yaml +++ b/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 diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml index 11a96dfb32..0ceea67e46 100644 --- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml +++ b/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: [] diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 745c4df123..f3069e1209 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/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: diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index e67a1dda82..b178d300dc 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/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 diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index d58c588afe..39a374b13d 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/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: diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index f87b484543..c3374a1eea 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/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: diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index fcff17d4f4..6cc3bd168c 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/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: [] diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 3cc5f46784..8dd483e2dd 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/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: diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 672a41cf89..0377bd0ae8 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/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]} diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index a16e57d6ea..3ff4ed1f69 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 7c9fd00460..93b377ada4 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/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. @@ -672,17 +672,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: @@ -728,10 +723,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: @@ -750,13 +744,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: diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index e429c2b3a9..02373c6de4 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index cf0d7d1939..0fd46cc6bc 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 4dd7f23296..90afaf69a0 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index b716087d1a..88149c8006 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 68600148d2..a7b9c1357b 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 6b6b7e7ea7..93e13f2be2 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 00e6a1ac7f..3b75e6c5df 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml index c72d4774c8..9b794321c3 100644 --- a/deployment/nova/novajoin-container-puppet.yaml +++ b/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 diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index ce522a8ff1..4e61f0d961 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/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: diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 4c8532d46c..bbf8e257fe 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/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: diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index d71b5ba778..46d168fa00 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/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: diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index c314b4c08f..a1091410bf 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/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: diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 83abe07e2a..4865184bd8 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/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: diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index ceb049f020..3aafc7fae7 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/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: diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 4dda3b43ec..5cc7e67f14 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 35b382a41d..36e8770ad7 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/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]} diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 1f7e8695dc..340728025d 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/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: diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index 44a08a170a..307999daee 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/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: diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index c3a74d4911..8586675d3e 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index 8dbd440010..8418412507 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index e84131e9b7..8bb9427b2a 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 017cfc62ff..b29d12c06c 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 6e274a9df2..2bab53dd02 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 68d13deb7e..2fa9e7a240 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 8c304f5012..1451dd8998 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/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: diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index 1077197140..319a3205d0 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -190,7 +190,7 @@ outputs: - /var/lib/sahara:/var/lib/sahara - /var/log/containers/sahara:/var/log/sahara environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: - name: create persistent directories file: diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index dd4df3a028..fd67b51df2 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-container-puppet.yaml @@ -119,7 +119,7 @@ outputs: - /var/lib/sahara:/var/lib/sahara - /var/log/containers/sahara:/var/log/sahara environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: - name: create persistent directories file: diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index dc0b0b5194..a31473e8b9 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -388,10 +388,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} - {} - swift_proxy: image: *swift_proxy_image @@ -412,7 +409,7 @@ outputs: - /dev:/dev - /var/log/containers/swift:/var/log/swift:z environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - if: - internal_tls_enabled - swift_proxy_tls_proxy: @@ -429,7 +426,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 directories diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 0dad48f1f9..34e499bee7 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -341,7 +341,7 @@ outputs: - /var/cache/swift:/var/cache/swift:z - /var/log/containers/swift:/var/log/swift:z environment: &kolla_env - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS swift_account_replicator: image: *swift_account_image net: host diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 4d3a9ace7b..939dc5fa94 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -325,7 +325,7 @@ outputs: - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - '' environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS zaqar_websocket: image: *zaqar_image net: host @@ -346,7 +346,7 @@ outputs: - /var/log/containers/zaqar:/var/log/zaqar - /var/log/containers/httpd/zaqar:/var/log/httpd environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS host_prep_tasks: - name: create persistent directories file: