Merge "Convert Docker*Image parameters"

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized aodh service
 
 parameters:
-  DockerAodhApiImage:
+  ContainerAodhApiImage:
     description: image
     type: string
-  DockerAodhConfigImage:
+  ContainerAodhConfigImage:
     description: The container image to use for the aodh config_volume
     type: string
   EndpointMap:
@@ -142,7 +142,7 @@ outputs:
             - "\n"
             - - "include tripleo::profile::base::aodh::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerAodhConfigImage}
+        config_image: {get_param: ContainerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -163,7 +163,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           aodh_init_log:
-            image: &aodh_api_image {get_param: DockerAodhApiImage}
+            image: &aodh_api_image {get_param: ContainerAodhApiImage}
             net: none
             user: root
             volumes:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Aodh Evaluator service
 
 parameters:
-  DockerAodhEvaluatorImage:
+  ContainerAodhEvaluatorImage:
     description: image
     type: string
-  DockerAodhConfigImage:
+  ContainerAodhConfigImage:
     description: The container image to use for the aodh config_volume
     type: string
   EndpointMap:
@@ -76,7 +76,7 @@ outputs:
             - "\n"
             - - "include tripleo::profile::base::aodh::evaluator"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerAodhConfigImage}
+        config_image: {get_param: ContainerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_evaluator.json:
           command: /usr/bin/aodh-evaluator
@@ -92,7 +92,7 @@ outputs:
       docker_config:
         step_4:
           aodh_evaluator:
-            image: {get_param: DockerAodhEvaluatorImage}
+            image: {get_param: ContainerAodhEvaluatorImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Aodh Listener service
 
 parameters:
-  DockerAodhListenerImage:
+  ContainerAodhListenerImage:
     description: image
     type: string
-  DockerAodhConfigImage:
+  ContainerAodhConfigImage:
     description: The container image to use for the aodh config_volume
     type: string
   EndpointMap:
@@ -77,7 +77,7 @@ outputs:
               - "\n"
               - - "include tripleo::profile::base::aodh::listener"
                 - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerAodhConfigImage}
+        config_image: {get_param: ContainerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_listener.json:
           command: /usr/bin/aodh-listener
@@ -93,7 +93,7 @@ outputs:
       docker_config:
         step_4:
           aodh_listener:
-            image: {get_param: DockerAodhListenerImage}
+            image: {get_param: ContainerAodhListenerImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Aodh Notifier service
 
 parameters:
-  DockerAodhNotifierImage:
+  ContainerAodhNotifierImage:
     description: image
     type: string
-  DockerAodhConfigImage:
+  ContainerAodhConfigImage:
     description: The container image to use for the aodh config_volume
     type: string
   EndpointMap:
@@ -77,7 +77,7 @@ outputs:
             - "\n"
             - - "include tripleo::profile::base::aodh::notifier"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerAodhConfigImage}
+        config_image: {get_param: ContainerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_notifier.json:
           command: /usr/bin/aodh-notifier
@@ -93,7 +93,7 @@ outputs:
       docker_config:
         step_4:
           aodh_notifier:
-            image: {get_param: DockerAodhNotifierImage}
+            image: {get_param: ContainerAodhNotifierImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,16 +4,16 @@ description: >
   OpenStack containerized Barbican API service
 
 parameters:
-  DockerBarbicanApiImage:
+  ContainerBarbicanApiImage:
     description: image
     type: string
-  DockerBarbicanConfigImage:
+  ContainerBarbicanConfigImage:
     description: The container image to use for the barbican config_volume
     type: string
-  DockerBarbicanKeystoneListenerImage:
+  ContainerBarbicanKeystoneListenerImage:
     description: image
     type: string
-  DockerBarbicanWorkerImage:
+  ContainerBarbicanWorkerImage:
     description: image
     type: string
   EndpointMap:
@@ -281,7 +281,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::barbican::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerBarbicanConfigImage}
+        config_image: {get_param: ContainerBarbicanConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/barbican_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -432,7 +432,7 @@ outputs:
           - if:
             - atos_hsm_enabled
             - barbican_init_atos_directory:
-                image: &barbican_api_image {get_param: DockerBarbicanApiImage}
+                image: &barbican_api_image {get_param: ContainerBarbicanApiImage}
                 user: root
                 volumes:
                   - /etc/proteccio:/etc/proteccio
@@ -681,7 +681,7 @@ outputs:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - barbican_keystone_listener:
                 start_order: 6
-                image: {get_param: DockerBarbicanKeystoneListenerImage}
+                image: {get_param: ContainerBarbicanKeystoneListenerImage}
                 net: host
                 privileged: false
                 restart: always
@@ -697,7 +697,7 @@ outputs:
                 environment: *kolla_env
             - barbican_worker:
                 start_order: 7
-                image: {get_param: DockerBarbicanWorkerImage}
+                image: {get_param: ContainerBarbicanWorkerImage}
                 net: host
                 privileged: false
                 restart: always

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

@@ -3,10 +3,10 @@ heat_template_version: rocky
 description: >
   OpenStack containerized Liquidio compute service
 parameters:
-  DockerLiquidioImage:
+  ContainerLiquidioImage:
     description: The container image to use for the Liquidio Service
     type: string
-  DockerLiquidioConfigImage:
+  ContainerLiquidioConfigImage:
     description: The container image to use for the Liquidio config generation
     type: string
   EndpointMap:
@@ -88,7 +88,7 @@ outputs:
         puppet_tags: liquidio_config
         step_config: |
           include ::tripleo::host::liquidio::compute
-        config_image: {get_param: DockerLiquidioConfigImage}
+        config_image: {get_param: ContainerLiquidioConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/liquidio_config.json:
           command: "/usr/bin/liquidio-compute start"
@@ -105,7 +105,7 @@ outputs:
         step_5:
           liquidio_compute_service:
             start_order: 10
-            image: {get_param: DockerLiquidioImage}
+            image: {get_param: ContainerLiquidioImage}
             net: host
             detach: true
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ceilometer Agent Central service
 
 parameters:
-  DockerCeilometerCentralImage:
+  ContainerCeilometerCentralImage:
     description: image
     type: string
-  DockerCeilometerConfigImage:
+  ContainerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
     type: string
   CeilometerAgentCentralLoggingSource:
@@ -89,7 +89,7 @@ outputs:
         puppet_tags: ceilometer_config
         step_config: |
           include ::tripleo::profile::base::ceilometer::agent::polling
-        config_image: {get_param: DockerCeilometerConfigImage}
+        config_image: {get_param: ContainerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_central.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces central --logfile /var/log/ceilometer/central.log
@@ -102,7 +102,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
+            image: &ceilometer_agent_central_image {get_param: ContainerCeilometerCentralImage}
             net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ceilometer Agent Compute service
 
 parameters:
-  DockerCeilometerComputeImage:
+  ContainerCeilometerComputeImage:
     description: image
     type: string
-  DockerCeilometerConfigImage:
+  ContainerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
     type: string
   EndpointMap:
@@ -85,7 +85,7 @@ outputs:
         puppet_tags: ceilometer_config
         step_config:
           include ::tripleo::profile::base::ceilometer::agent::polling
-        config_image: {get_param: DockerCeilometerConfigImage}
+        config_image: {get_param: ContainerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_compute.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces compute --logfile /var/log/ceilometer/compute.log
@@ -97,7 +97,7 @@ outputs:
       docker_config:
         step_4:
           ceilometer_agent_compute:
-            image: {get_param: DockerCeilometerComputeImage}
+            image: {get_param: ContainerCeilometerComputeImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ceilometer Agent Ipmi service
 
 parameters:
-  DockerCeilometerIpmiImage:
+  ContainerCeilometerIpmiImage:
     description: image
     type: string
-  DockerCeilometerConfigImage:
+  ContainerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
     type: string
   CeilometerAgentIpmiLoggingSource:
@@ -97,7 +97,7 @@ outputs:
         puppet_tags: ceilometer_config
         step_config: |
           include ::tripleo::profile::base::ceilometer::agent::polling
-        config_image: {get_param: DockerCeilometerConfigImage}
+        config_image: {get_param: ContainerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
@@ -110,7 +110,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage}
+            image: &ceilometer_agent_ipmi_image {get_param: ContainerCeilometerIpmiImage}
             net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ceilometer Agent Notification service
 
 parameters:
-  DockerCeilometerNotificationImage:
+  ContainerCeilometerNotificationImage:
     description: image
     type: string
-  DockerCeilometerConfigImage:
+  ContainerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
     type: string
   CeilometerAgentNotificationLoggingSource:
@@ -89,7 +89,7 @@ outputs:
         puppet_tags: ceilometer_config
         step_config: |
           include ::tripleo::profile::base::ceilometer::agent::notification
-        config_image: {get_param: DockerCeilometerConfigImage}
+        config_image: {get_param: ContainerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_notification.json:
           command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
@@ -113,7 +113,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
+            image: &ceilometer_agent_notification_image {get_param: ContainerCeilometerNotificationImage}
             net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

deployment/ceph-ansible/ceph-base.yaml

@@ -156,7 +156,7 @@ parameters:
     description: The password for the swift service account
     type: string
     hidden: true
-  DockerCephDaemonImage:
+  ContainerCephDaemonImage:
     description: image
     type: string
   CephAnsiblePlaybookVerbosity:
@@ -197,7 +197,7 @@ parameters:
 conditions:
   custom_registry_host:
     yaql:
-      data: {get_param: DockerCephDaemonImage}
+      data: {get_param: ContainerCephDaemonImage}
       expression: $.data.split('/')[0].matches('(\.|:)')
   perform_upgrade:
     equals: [{get_param: StackUpdateType}, 'UPGRADE']
@@ -208,7 +208,7 @@ conditions:
         - ''
 
 resources:
-  DockerImageUrlParts:
+  ContainerImageUrlParts:
     type: OS::Heat::Value
     properties:
       type: json
@@ -218,21 +218,21 @@ resources:
           - custom_registry_host
           - yaql:
               expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[1]
-              data: {get_param: DockerCephDaemonImage}
+              data: {get_param: ContainerCephDaemonImage}
           - docker.io
         image:
           if:
           - custom_registry_host
           - yaql:
               expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[2]
-              data: {get_param: DockerCephDaemonImage}
+              data: {get_param: ContainerCephDaemonImage}
           - yaql:
               expression: $.data.rightSplit(':', 1)[0]
-              data: {get_param: DockerCephDaemonImage}
+              data: {get_param: ContainerCephDaemonImage}
         image_tag:
           yaql:
             expression: $.data.rightSplit(':', 1)[1]
-            data: {get_param: DockerCephDaemonImage}
+            data: {get_param: ContainerCephDaemonImage}
 
   CephBaseAnsibleVars:
     type: OS::Heat::Value
@@ -243,9 +243,9 @@ resources:
           fsid: { get_param: CephClusterFSID }
           cluster: { get_param: CephClusterName }
           docker: true
-          ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
+          ceph_docker_registry: {get_attr: [ContainerImageUrlParts, value, host]}
-          ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
+          ceph_docker_image: {get_attr: [ContainerImageUrlParts, value, image]}
-          ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
+          ceph_docker_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]}
           containerized_deployment: true
           public_network:
             list_join:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder API service
 
 parameters:
-  DockerCinderApiImage:
+  ContainerCinderApiImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   CinderApiLoggingSource:
@@ -217,7 +217,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::cinder::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -248,7 +248,7 @@ outputs:
       docker_config:
         step_2:
           cinder_api_init_logs:
-            image: &cinder_api_image {get_param: DockerCinderApiImage}
+            image: &cinder_api_image {get_param: ContainerCinderApiImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder Backup service
 
 parameters:
-  DockerCinderBackupImage:
+  ContainerCinderBackupImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   EndpointMap:
@@ -150,7 +150,7 @@ outputs:
                   params:
                     DRIVER: {get_param: CinderBackupBackend}
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_backup.json:
           command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -186,7 +186,7 @@ outputs:
         step_3:
           cinder_backup_init_logs:
             start_order: 0
-            image: &cinder_backup_image {get_param: DockerCinderBackupImage}
+            image: &cinder_backup_image {get_param: ContainerCinderBackupImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder Backup service
 
 parameters:
-  DockerCinderBackupImage:
+  ContainerCinderBackupImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   CinderBackupBackend:
@@ -115,7 +115,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerCinderBackupImage}
+                      data: {get_param: ContainerCinderBackupImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
@@ -140,7 +140,7 @@ outputs:
             - "\n"
             - - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
               - "include ::tripleo::profile::pacemaker::cinder::backup"
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_backup.json:
           command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -169,7 +169,7 @@ outputs:
         step_3:
           cinder_backup_init_logs:
             start_order: 0
-            image: {get_param: DockerCinderBackupImage}
+            image: {get_param: ContainerCinderBackupImage}
             net: none
             privileged: false
             user: root
@@ -194,7 +194,7 @@ outputs:
                     'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-cinder-backup; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-backup; echo "openstack-cinder-backup restart invoked"; fi'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-            image: {get_param: DockerCinderBackupImage}
+            image: {get_param: ContainerCinderBackupImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -217,7 +217,7 @@ outputs:
                   - puppet_debug_enabled
                   - - '--debug --verbose'
                   - - ''
-            image: {get_param: DockerCinderBackupImage}
+            image: {get_param: ContainerCinderBackupImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -236,7 +236,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerCinderBackupImage}
+            container_image: {get_param: ContainerCinderBackupImage}
             container_image_latest: *cinder_backup_image_pcmklatest
       update_tasks:
         - name: Cinder-Backup fetch and retag container image for pacemaker
@@ -244,7 +244,7 @@ outputs:
           block: &cinder_backup_fetch_retag_container_tasks
             - name: Get docker Cinder-Backup image
               set_fact:
-                docker_image: {get_param: DockerCinderBackupImage}
+                docker_image: {get_param: ContainerCinderBackupImage}
                 docker_image_latest: *cinder_backup_image_pcmklatest
             - name: Get previous Cinder-Backup image id
               shell: "{{container_cli}} images | awk '/cinder-backup.* pcmklatest/{print $3}' | uniq"

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder Scheduler service
 
 parameters:
-  DockerCinderSchedulerImage:
+  ContainerCinderSchedulerImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   CinderSchedulerLoggingSource:
@@ -91,7 +91,7 @@ outputs:
             - - "include ::tripleo::profile::base::cinder::scheduler"
             - - {get_attr: [CinderBase, role_data, step_config]}
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_scheduler.json:
           command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -107,7 +107,7 @@ outputs:
       docker_config:
         step_2:
           cinder_scheduler_init_logs:
-            image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
+            image: &cinder_scheduler_image {get_param: ContainerCinderSchedulerImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder Volume service
 
 parameters:
-  DockerCinderVolumeImage:
+  ContainerCinderVolumeImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   DockerCinderVolumeUlimit:
@@ -275,7 +275,7 @@ outputs:
             - - "include ::tripleo::profile::base::lvm"
               - "include ::tripleo::profile::base::cinder::volume"
               - get_attr: [MySQLClient, role_data, step_config]
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_volume.json:
           command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -308,7 +308,7 @@ outputs:
         step_3:
           cinder_volume_init_logs:
             start_order: 0
-            image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
+            image: &cinder_volume_image {get_param: ContainerCinderVolumeImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Cinder Volume service
 
 parameters:
-  DockerCinderVolumeImage:
+  ContainerCinderVolumeImage:
     description: image
     type: string
-  DockerCinderConfigImage:
+  ContainerCinderConfigImage:
     description: The container image to use for the cinder config_volume
     type: string
   EndpointMap:
@@ -101,7 +101,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerCinderVolumeImage}
+                      data: {get_param: ContainerCinderVolumeImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
@@ -128,7 +128,7 @@ outputs:
             - - "include ::tripleo::profile::base::lvm"
             - - "include ::tripleo::profile::pacemaker::cinder::volume"
               - get_attr: [MySQLClient, role_data, step_config]
-        config_image: {get_param: DockerCinderConfigImage}
+        config_image: {get_param: ContainerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_volume.json:
           command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -154,7 +154,7 @@ outputs:
         step_3:
           cinder_volume_init_logs:
             start_order: 0
-            image: {get_param: DockerCinderVolumeImage}
+            image: {get_param: ContainerCinderVolumeImage}
             net: none
             privileged: false
             user: root
@@ -179,7 +179,7 @@ outputs:
                     'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] &&  /usr/sbin/pcs resource show openstack-cinder-volume; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-volume; echo "openstack-cinder-volume restart invoked"; fi'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-            image: {get_param: DockerCinderVolumeImage}
+            image: {get_param: ContainerCinderVolumeImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -202,7 +202,7 @@ outputs:
                   - puppet_debug_enabled
                   - - '--debug --verbose'
                   - - ''
-            image: {get_param: DockerCinderVolumeImage}
+            image: {get_param: ContainerCinderVolumeImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -221,7 +221,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerCinderVolumeImage}
+            container_image: {get_param: ContainerCinderVolumeImage}
             container_image_latest: *cinder_volume_image_pcmklatest
       update_tasks:
         - name: Cinder-Volume fetch and retag container image for pacemaker
@@ -229,7 +229,7 @@ outputs:
           block: &cinder_volume_fetch_retag_container_tasks
             - name: Get docker Cinder-Volume image
               set_fact:
-                docker_image: {get_param: DockerCinderVolumeImage}
+                docker_image: {get_param: ContainerCinderVolumeImage}
                 docker_image_latest: *cinder_volume_image_pcmklatest
             - name: Get previous Cinder-Volume image id
               shell: "{{container_cli}} images | awk '/cinder-volume.* pcmklatest/{print $3}' | uniq"

deployment/database/mysql-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   MySQL service deployment using puppet
 
 parameters:
-  DockerMysqlImage:
+  ContainerMysqlImage:
     description: image
     type: string
-  DockerMysqlConfigImage:
+  ContainerMysqlConfigImage:
     description: The container image to use for the mysql config_volume
     type: string
   EndpointMap:
@@ -95,7 +95,7 @@ outputs:
             - "\n"
             - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
               - {get_attr: [MysqlBase, role_data, step_config]}
-        config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
+        config_image: &mysql_config_image {get_param: ContainerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/libexec/mysqld --user=mysql
@@ -123,7 +123,7 @@ outputs:
         # Kolla_bootstrap runs before permissions set by kolla_config
         step_1:
           mysql_init_logs:
-            image: &mysql_image {get_param: DockerMysqlImage}
+            image: &mysql_image {get_param: ContainerMysqlImage}
             net: none
             privileged: false
             user: root
@@ -286,7 +286,7 @@ outputs:
                 mysql_json: "{{ mysql_paunch_docker.stdout if mysql_paunch_docker.changed else mysql_paunch.stdout | from_json }}"
             - name: Mysql container image after upgrade
               set_fact:
-                post_upgrade_mysql_image: {get_param: DockerMysqlImage}
+                post_upgrade_mysql_image: {get_param: ContainerMysqlImage}
             - name: Redo log clean-up script
               set_fact:
                 # The purpose of this script is to start mysql so that it

deployment/database/mysql-pacemaker-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   MySQL service deployment with pacemaker bundle
 
 parameters:
-  DockerMysqlImage:
+  ContainerMysqlImage:
     description: image
     type: string
-  DockerMysqlConfigImage:
+  ContainerMysqlConfigImage:
     description: The container image to use for the mysql config_volume
     type: string
   EndpointMap:
@@ -130,7 +130,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerMysqlImage}
+                      data: {get_param: ContainerMysqlImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
@@ -168,7 +168,7 @@ outputs:
             - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
               - "exec {'wait-for-settle': command => '/bin/true' }"
               - "include ::tripleo::profile::pacemaker::database::mysql_bundle"
-        config_image: {get_param: DockerMysqlConfigImage}
+        config_image: {get_param: ContainerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/sbin/pacemaker_remoted
@@ -204,7 +204,7 @@ outputs:
           mysql_data_ownership:
             start_order: 0
             detach: false
-            image: {get_param: DockerMysqlImage}
+            image: {get_param: ContainerMysqlImage}
             net: host
             user: root
             # Kolla does only non-recursive chown
@@ -214,7 +214,7 @@ outputs:
           mysql_bootstrap:
             start_order: 1
             detach: false
-            image: {get_param: DockerMysqlImage}
+            image: {get_param: ContainerMysqlImage}
             net: host
             user: root
             # Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done
@@ -278,7 +278,7 @@ outputs:
                     'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show galera-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT galera-bundle; echo "galera-bundle restart invoked"; fi'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-            image: {get_param: DockerMysqlImage}
+            image: {get_param: ContainerMysqlImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -301,7 +301,7 @@ outputs:
                   - puppet_debug_enabled
                   - - '--debug'
                   - - ''
-            image: {get_param: DockerMysqlImage}
+            image: {get_param: ContainerMysqlImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -340,7 +340,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerMysqlImage}
+            container_image: {get_param: ContainerMysqlImage}
             container_image_latest: *mysql_image_pcmklatest
       update_tasks:
         - name: Mariadb fetch and retag container image for pacemaker
@@ -348,7 +348,7 @@ outputs:
           block: &mysql_fetch_retag_container_tasks
             - name: Get docker Mariadb image
               set_fact:
-                docker_image: {get_param: DockerMysqlImage}
+                docker_image: {get_param: ContainerMysqlImage}
                 docker_image_latest: *mysql_image_pcmklatest
             - name: Get previous Mariadb image id
               shell: "{{container_cli}} images | awk '/mariadb.* pcmklatest/{print $3}' | uniq"

deployment/database/redis-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Redis services
 
 parameters:
-  DockerRedisImage:
+  ContainerRedisImage:
     description: image
     type: string
-  DockerRedisConfigImage:
+  ContainerRedisConfigImage:
     description: The container image to use for the redis config_volume
     type: string
   EndpointMap:
@@ -127,7 +127,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::database::redis
               - {get_attr: [RedisBase, role_data, step_config]}
-        config_image: {get_param: DockerRedisConfigImage}
+        config_image: {get_param: ContainerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/bin/redis-server /etc/redis.conf
@@ -153,7 +153,7 @@ outputs:
             - redis_init_logs:
                 start_order: 0
                 detach: false
-                image: &redis_image {get_param: DockerRedisImage}
+                image: &redis_image {get_param: ContainerRedisImage}
                 net: none
                 privileged: false
                 user: root

deployment/database/redis-pacemaker-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Redis services
 
 parameters:
-  DockerRedisImage:
+  ContainerRedisImage:
     description: image
     type: string
-  DockerRedisConfigImage:
+  ContainerRedisConfigImage:
     description: The container image to use for the redis config_volume
     type: string
   EndpointMap:
@@ -100,7 +100,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerRedisImage}
+                      data: {get_param: ContainerRedisImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
@@ -160,7 +160,7 @@ outputs:
         puppet_tags: 'exec'
         step_config: |
           include ::tripleo::profile::pacemaker::database::redis_bundle
-        config_image: &redis_config_image {get_param: DockerRedisConfigImage}
+        config_image: &redis_config_image {get_param: ContainerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/sbin/pacemaker_remoted
@@ -226,7 +226,7 @@ outputs:
                         'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show redis-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT redis-bundle; echo "redis-bundle restart invoked"; fi'
                       params:
                         PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-                image: {get_param: DockerRedisConfigImage}
+                image: {get_param: ContainerRedisConfigImage}
                 volumes:
                   list_concat:
                     - {get_attr: [ContainersCommon, volumes]}
@@ -312,7 +312,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerRedisImage}
+            container_image: {get_param: ContainerRedisImage}
             container_image_latest: *redis_image_pcmklatest
       update_tasks:
         - name: Redis fetch and retag container image for pacemaker
@@ -320,7 +320,7 @@ outputs:
           block: &redis_fetch_retag_container_tasks
             - name: Get docker Redis image
               set_fact:
-                docker_image: {get_param: DockerRedisImage}
+                docker_image: {get_param: ContainerRedisImage}
                 docker_image_latest: *redis_image_pcmklatest
             - name: Get previous Redis image id
               shell: "{{container_cli}} images | awk '/redis.* pcmklatest/{print $3}' | uniq"

deployment/deprecated/logging/fluentd-container-puppet.yaml

@@ -5,10 +5,10 @@ description: >
   This service is deprecated and will be removed in future releases.
 
 parameters:
-  DockerFluentdImage:
+  ContainerFluentdImage:
     description: image
     type: string
-  DockerFluentdConfigImage:
+  ContainerFluentdConfigImage:
     description: The container image to use fluentd config_volume
     type: string
   EndpointMap:
@@ -91,7 +91,7 @@ outputs:
         puppet_tags: config
         step_config: |
           include ::tripleo::profile::base::logging::fluentd
-        config_image: {get_param: DockerFluentdConfigImage}
+        config_image: {get_param: ContainerFluentdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/fluentd.json:
           command: /usr/bin/fluentd -c /etc/fluentd/fluent.conf -o /var/log/fluentd/fluentd.log
@@ -110,7 +110,7 @@ outputs:
       docker_config:
         step_3:
           fluentd:
-            image: {get_param: DockerFluentdImage}
+            image: {get_param: ContainerFluentdImage}
             net: host
             privileged: true
             user: root

deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

@@ -5,10 +5,10 @@ description: >
   This service is deprecated and will be remove in future releases.
 
 parameters:
-  DockerSensuClientImage:
+  ContainerSensuClientImage:
     description: image
     type: string
-  DockerSensuConfigImage:
+  ContainerSensuConfigImage:
     description: The container image to use for the sensu config_volume
     type: string
   EndpointMap:
@@ -164,7 +164,7 @@ outputs:
         config_volume: sensu
         puppet_tags:  sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
         step_config: include ::tripleo::profile::base::monitoring::sensu
-        config_image: {get_param: DockerSensuConfigImage}
+        config_image: {get_param: ContainerSensuConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sensu-client.json:
           command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
@@ -180,7 +180,7 @@ outputs:
       docker_config:
         step_3:
           sensu_client:
-            image: {get_param: DockerSensuClientImage}
+            image: {get_param: ContainerSensuClientImage}
             net: host
             privileged: true
             # NOTE(mmagr) kolla image changes the user to 'sensu', we need it

deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Nova Consoleauth service
 
 parameters:
-  DockerNovaConsoleauthImage:
+  ContainerNovaConsoleauthImage:
     description: image
     type: string
-  DockerNovaConfigImage:
+  ContainerNovaConfigImage:
     description: The container image to use for the nova config_volume
     type: string
   NovaConsoleauthLoggingSource:
@@ -56,7 +56,7 @@ resources:
   NovaLogging:
     type: OS::TripleO::Services::Logging::NovaCommon
     properties:
-      DockerNovaImage: {get_param: DockerNovaConsoleauthImage}
+      ContainerNovaImage: {get_param: ContainerNovaConsoleauthImage}
       NovaServiceName: 'consoleauth'
 
   NovaBase:
@@ -96,7 +96,7 @@ outputs:
             - "\n"
             - - include tripleo::profile::base::nova::consoleauth
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerNovaConfigImage}
+        config_image: {get_param: ContainerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_consoleauth.json:
           command:
@@ -116,7 +116,7 @@ outputs:
       docker_config:
         step_4:
           nova_consoleauth:
-            image: {get_param: DockerNovaConsoleauthImage}
+            image: {get_param: ContainerNovaConsoleauthImage}
             net: host
             privileged: false
             restart: always

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

@@ -6,10 +6,10 @@ description: >
   be disabled in future releases.
 
 parameters:
-  DockerOpendaylightApiImage:
+  ContainerOpendaylightApiImage:
     description: image
     type: string
-  DockerOpendaylightConfigImage:
+  ContainerOpendaylightConfigImage:
     description: image
     type: string
   EndpointMap:
@@ -193,7 +193,7 @@ outputs:
         puppet_tags: odl_user,odl_keystore
         step_config: |
           include tripleo::profile::base::neutron::opendaylight
-        config_image: {get_param: DockerOpendaylightConfigImage}
+        config_image: {get_param: ContainerOpendaylightConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/opendaylight_api.json:
           command: /opt/opendaylight/bin/karaf server
@@ -210,7 +210,7 @@ outputs:
         step_1:
           opendaylight_api:
             start_order: 0
-            image: &odl_api_image {get_param: DockerOpendaylightApiImage}
+            image: &odl_api_image {get_param: ContainerOpendaylightApiImage}
             privileged: false
             net: host
             detach: true

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

@@ -6,10 +6,10 @@ description: >
   will be disabled in future releases.
 
 parameters:
-  DockerPankoApiImage:
+  ContainerPankoApiImage:
     description: image
     type: string
-  DockerPankoConfigImage:
+  ContainerPankoConfigImage:
     description: The container image to use for the panko config_volume
     type: string
   EndpointMap:
@@ -229,7 +229,7 @@ outputs:
             - "\n"
             - - "include tripleo::profile::base::panko::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerPankoConfigImage}
+        config_image: {get_param: ContainerPankoConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/panko_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -262,7 +262,7 @@ outputs:
           get_attr: [PankoApiLogging, docker_config, step_2]
         step_3:
           panko_db_sync:
-            image: &panko_api_image {get_param: DockerPankoApiImage}
+            image: &panko_api_image {get_param: ContainerPankoApiImage}
             net: host
             detach: false
             privileged: false

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized EC2 API service
 
 parameters:
-  DockerEc2ApiImage:
+  ContainerEc2ApiImage:
     description: image
     type: string
-  DockerEc2ApiConfigImage:
+  ContainerEc2ApiConfigImage:
     description: The container image to use for the ec2_api config_volume
     type: string
   Ec2ApiLoggingSource:
@@ -226,7 +226,7 @@ outputs:
             - "\n"
             - - "include tripleo::profile::base::nova::ec2api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerEc2ApiConfigImage}
+        config_image: {get_param: ContainerEc2ApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ec2_api.json:
           command: /usr/bin/ec2-api
@@ -265,7 +265,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ec2_api_init_logs:
-            image: &ec2_api_image {get_param: DockerEc2ApiImage}
+            image: &ec2_api_image {get_param: ContainerEc2ApiImage}
             net: none
             privileged: false
             user: root

deployment/etcd/etcd-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   Containerized etcd services
 
 parameters:
-  DockerEtcdImage:
+  ContainerEtcdImage:
     description: image
     type: string
-  DockerEtcdConfigImage:
+  ContainerEtcdConfigImage:
     description: The container image to use for the etcd config_volume
     type: string
   EndpointMap:
@@ -107,7 +107,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: etcd
-        config_image: &etcd_config_image {get_param: DockerEtcdConfigImage}
+        config_image: &etcd_config_image {get_param: ContainerEtcdConfigImage}
         step_config:
           list_join:
             - "\n"
@@ -128,7 +128,7 @@ outputs:
       docker_config:
         step_2:
           etcd:
-            image: {get_param: DockerEtcdImage}
+            image: {get_param: ContainerEtcdImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Designate API service
 
 parameters:
-  DockerDesignateApiImage:
+  ContainerDesignateApiImage:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   EndpointMap:
@@ -123,7 +123,7 @@ outputs:
         puppet_tags: designate_config
         step_config: |
           include tripleo::profile::base::designate::api
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_api.json:
           command: /usr/bin/designate-api --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/api.log
@@ -140,7 +140,7 @@ outputs:
         step_4:
           designate_api:
             start_order: 15
-            image: &designate_api_image {get_param: DockerDesignateApiImage}
+            image: &designate_api_image {get_param: ContainerDesignateApiImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Designate Central service
 
 parameters:
-  DockerDesignateCentralImage:
+  ContainerDesignateCentralImage:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   EndpointMap:
@@ -116,7 +116,7 @@ outputs:
             - - {get_attr: [DesignateBase, role_data, step_config]}
               - "include tripleo::profile::base::designate::central"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_central.json:
           command: /usr/bin/designate-central --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/central.log
@@ -133,7 +133,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           designate_init_logs:
-            image: &designate_central_image {get_param: DockerDesignateCentralImage}
+            image: &designate_central_image {get_param: ContainerDesignateCentralImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Designate MiniDNS service
 
 parameters:
-  DockerDesignateMDNSImage:
+  ContainerDesignateMDNSImage:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   EndpointMap:
@@ -121,7 +121,7 @@ outputs:
             - - {get_attr: [DesignateBase, role_data, step_config]}
               - "include tripleo::profile::base::designate::mdns"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_mdns.json:
           command: /usr/bin/designate-mdns --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/mdns.log
@@ -137,7 +137,7 @@ outputs:
       docker_config:
         step_4:
           designate_mdns:
-            image: &designate_mdns_image {get_param: DockerDesignateMDNSImage}
+            image: &designate_mdns_image {get_param: ContainerDesignateMDNSImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Designate Producer service
 
 parameters:
-  DockerDesignateProducerImage:
+  ContainerDesignateProducerImage:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   DesignateProducerLoggingSource:
@@ -96,7 +96,7 @@ outputs:
             - "\n"
             - - {get_attr: [DesignateBase, role_data, step_config]}
               - "include tripleo::profile::base::designate::producer"
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_producer.json:
           command: /usr/bin/designate-producer --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/producer.log
@@ -112,7 +112,7 @@ outputs:
       docker_config:
         step_4:
           designate_producer:
-            image: &designate_producer_image {get_param: DockerDesignateProducerImage}
+            image: &designate_producer_image {get_param: ContainerDesignateProducerImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Designate Sink service
 
 parameters:
-  DockerDesignateSinkImage:
+  ContainerDesignateSinkImage:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   EndpointMap:
@@ -86,7 +86,7 @@ outputs:
             - "\n"
             - - {get_attr: [DesignateBase, role_data, step_config]}
               - "include tripleo::profile::base::designate::sink"
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_sink.json:
           command: /usr/bin/designate-sink --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/sink.log
@@ -102,7 +102,7 @@ outputs:
       docker_config:
         step_4:
           designate_sink:
-            image: &designate_sink_image {get_param: DockerDesignateSinkImage}
+            image: &designate_sink_image {get_param: ContainerDesignateSinkImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,13 +4,13 @@ description: >
   OpenStack containerized Designate Worker service
 
 parameters:
-  DockerDesignateWorkerImage:
+  ContainerDesignateWorkerImage:
     description: image
     type: string
-  DockerDesignateBackendBIND9Image:
+  ContainerDesignateBackendBIND9Image:
     description: image
     type: string
-  DockerDesignateConfigImage:
+  ContainerDesignateConfigImage:
     description: The container image to use for the designate config_volume
     type: string
   DesignateWorkerLoggingSource:
@@ -150,7 +150,7 @@ outputs:
             - - {get_attr: [DesignateBase, role_data, step_config]}
               - "include tripleo::profile::base::designate::worker"
               - include ::designate::backend::bind9
-        config_image: {get_param: DockerDesignateConfigImage}
+        config_image: {get_param: ContainerDesignateConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/designate_worker.json:
           command: /usr/bin/designate-worker --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/worker.log
@@ -187,7 +187,7 @@ outputs:
       docker_config:
         step_4:
           designate_worker:
-            image: &designate_worker_image {get_param: DockerDesignateWorkerImage}
+            image: &designate_worker_image {get_param: ContainerDesignateWorkerImage}
             net: host
             privileged: false
             restart: always
@@ -204,7 +204,7 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           designate_backend_bind9:
-            image: {get_param: DockerDesignateBackendBIND9Image}
+            image: {get_param: ContainerDesignateBackendBIND9Image}
             net: host
             privileged: true
             restart: always

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

@@ -209,10 +209,10 @@ parameters:
     default: []
     description: list of optional volumes to be mounted
     type: comma_delimited_list
-  DockerGlanceApiImage:
+  ContainerGlanceApiImage:
     description: image
     type: string
-  DockerGlanceApiConfigImage:
+  ContainerGlanceApiConfigImage:
     description: The container image to use for the glance_api config_volume
     type: string
 
@@ -438,7 +438,7 @@ outputs:
                   include ::glance::cache::pruner
                 - ''
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerGlanceApiConfigImage}
+        config_image: {get_param: ContainerGlanceApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/glance_api.json:
           command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf
@@ -479,7 +479,7 @@ outputs:
           get_attr: [GlanceLogging, docker_config, step_2]
         step_3:
           glance_api_db_sync:
-            image: &glance_api_image {get_param: DockerGlanceApiImage}
+            image: &glance_api_image {get_param: ContainerGlanceApiImage}
             net: host
             privileged: false
             detach: false

deployment/glance/glance-api-logging-file-container.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Glance API service
 
 parameters:
-  DockerGlanceApiImage:
+  ContainerGlanceApiImage:
     description: image
     type: string
 
@@ -22,7 +22,7 @@ outputs:
       # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
       step_2:
         glance_init_logs:
-          image: {get_param: DockerGlanceApiImage}
+          image: {get_param: ContainerGlanceApiImage}
           net: none
           privileged: false
           user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized gnocchi service
 
 parameters:
-  DockerGnocchiApiImage:
+  ContainerGnocchiApiImage:
     description: image
     type: string
-  DockerGnocchiConfigImage:
+  ContainerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
     type: string
   GnocchiApiLoggingSource:
@@ -225,7 +225,7 @@ outputs:
         puppet_tags: gnocchi_api_paste_ini,gnocchi_config
         step_config: |
           include ::tripleo::profile::base::gnocchi::api
-        config_image: {get_param: DockerGnocchiConfigImage}
+        config_image: {get_param: ContainerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -274,7 +274,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           gnocchi_init_log:
-            image: &gnocchi_api_image {get_param: DockerGnocchiApiImage}
+            image: &gnocchi_api_image {get_param: ContainerGnocchiApiImage}
             net: none
             user: root
             volumes:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Gnocchi Metricd service
 
 parameters:
-  DockerGnocchiMetricdImage:
+  ContainerGnocchiMetricdImage:
     description: image
     type: string
-  DockerGnocchiConfigImage:
+  ContainerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
     type: string
   EndpointMap:
@@ -104,7 +104,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::gnocchi::metricd"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerGnocchiConfigImage}
+        config_image: {get_param: ContainerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_metricd.json:
           command: /usr/bin/gnocchi-metricd
@@ -133,7 +133,7 @@ outputs:
         step_5:
           gnocchi_metricd:
             start_order: 1
-            image: {get_param: DockerGnocchiMetricdImage}
+            image: {get_param: ContainerGnocchiMetricdImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Gnocchi Statsd service
 
 parameters:
-  DockerGnocchiStatsdImage:
+  ContainerGnocchiStatsdImage:
     description: image
     type: string
-  DockerGnocchiConfigImage:
+  ContainerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
     type: string
   EndpointMap:
@@ -98,7 +98,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::gnocchi::statsd"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerGnocchiConfigImage}
+        config_image: {get_param: ContainerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_statsd.json:
           command: /usr/bin/gnocchi-statsd
@@ -127,7 +127,7 @@ outputs:
         step_5:
           gnocchi_statsd:
             start_order: 1
-            image: {get_param: DockerGnocchiStatsdImage}
+            image: {get_param: ContainerGnocchiStatsdImage}
             net: host
             privileged: false
             restart: always

deployment/haproxy/haproxy-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized HAproxy service
 
 parameters:
-  DockerHAProxyImage:
+  ContainerHAProxyImage:
     description: image
     type: string
-  DockerHAProxyConfigImage:
+  ContainerHAProxyConfigImage:
     description: The container image to use for the haproxy config_volume
     type: string
   ServiceData:
@@ -198,7 +198,7 @@ outputs:
         puppet_tags: haproxy_config
         step_config: |
           class {'::tripleo::profile::base::haproxy': manage_firewall => false}
-        config_image: {get_param: DockerHAProxyConfigImage}
+        config_image: {get_param: ContainerHAProxyConfigImage}
         volumes:
           list_concat:
           - if:
@@ -250,7 +250,7 @@ outputs:
           - get_attr: [HAProxyLogging, docker_config, step_1]
           - haproxy:
               start_order: 1
-              image: {get_param: DockerHAProxyImage}
+              image: {get_param: ContainerHAProxyImage}
               net: host
               restart: always
               security_opt: label=disable

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized HAproxy service for pacemaker
 
 parameters:
-  DockerHAProxyImage:
+  ContainerHAProxyImage:
     description: image
     type: string
-  DockerHAProxyConfigImage:
+  ContainerHAProxyConfigImage:
     description: The container image to use for the haproxy config_volume
     type: string
   ServiceData:
@@ -144,7 +144,7 @@ outputs:
             tripleo::haproxy::haproxy_log_address: {get_param: HAProxySyslogAddress}
             tripleo::haproxy::haproxy_log_facility: {get_param: HAProxySyslogFacility}
           - haproxy_docker: true
-            tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: DockerHAProxyImage}
+            tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: ContainerHAProxyImage}
             tripleo::profile::pacemaker::haproxy_bundle::container_backend: {get_param: ContainerCli}
             # the list of directories that contain the certs to bind mount in the countainer
             # bind-mounting the directories rather than all the cert, key and pem files ensures
@@ -169,7 +169,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerHAProxyImage}
+                      data: {get_param: ContainerHAProxyImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
       # BEGIN DOCKER SETTINGS
@@ -183,7 +183,7 @@ outputs:
               - "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}"
               - "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }"
               - 'include ::tripleo::profile::pacemaker::haproxy_bundle'
-        config_image: {get_param: DockerHAProxyConfigImage}
+        config_image: {get_param: ContainerHAProxyConfigImage}
         volumes: &deployed_cert_mount
           yaql:
             expression: $.data.select($+":"+$+":ro")
@@ -245,7 +245,7 @@ outputs:
                     'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show haproxy-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT haproxy-bundle; echo "haproxy-bundle restart invoked"; fi'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-            image: {get_param: DockerHAProxyImage}
+            image: {get_param: ContainerHAProxyImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -269,7 +269,7 @@ outputs:
                   - puppet_debug_enabled
                   - - '--debug'
                   - - ''
-            image: {get_param: DockerHAProxyImage}
+            image: {get_param: ContainerHAProxyImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -331,7 +331,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerHAProxyImage}
+            container_image: {get_param: ContainerHAProxyImage}
             container_image_latest: *haproxy_image_pcmklatest
         - name: Run puppet on the host to apply IPtables rules
           when: step|int == 2
@@ -401,7 +401,7 @@ outputs:
           block: &haproxy_fetch_retag_container_tasks
             - name: Get docker Haproxy image
               set_fact:
-                docker_image: {get_param: DockerHAProxyImage}
+                docker_image: {get_param: ContainerHAProxyImage}
                 docker_image_latest: *haproxy_image_pcmklatest
             - name: Get previous Haproxy image id
               shell: "{{container_cli}} images | awk '/haproxy.* pcmklatest/{print $3}' | uniq"

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

@@ -4,11 +4,11 @@ description: >
   OpenStack containerized Heat API CFN service
 
 parameters:
-  DockerHeatApiCfnImage:
+  ContainerHeatApiCfnImage:
     description: image
     type: string
   # puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
-  DockerHeatApiCfnConfigImage:
+  ContainerHeatApiCfnConfigImage:
     description: The container image to use for the heat_api_cfn config_volume
     type: string
   HeatApiCfnLoggingSource:
@@ -162,7 +162,7 @@ outputs:
         puppet_tags: heat_config,file,concat,file_line
         step_config: |
           include ::tripleo::profile::base::heat::api_cfn
-        config_image: {get_param: DockerHeatApiCfnConfigImage}
+        config_image: {get_param: ContainerHeatApiCfnConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api_cfn.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -184,7 +184,7 @@ outputs:
           get_attr: [HeatApiCfnLogging, docker_config, step_2]
         step_4:
           heat_api_cfn:
-            image: {get_param: DockerHeatApiCfnImage}
+            image: {get_param: ContainerHeatApiCfnImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,11 +4,11 @@ description: >
   OpenStack containerized Heat API service
 
 parameters:
-  DockerHeatApiImage:
+  ContainerHeatApiImage:
     description: image
     type: string
   # puppet needs the heat-wsgi-api binary from centos-binary-heat-api
-  DockerHeatApiConfigImage:
+  ContainerHeatApiConfigImage:
     description: The container image to use for the heat_api config_volume
     type: string
   HeatApiLoggingSource:
@@ -178,7 +178,7 @@ outputs:
         puppet_tags: heat_config,file,concat,file_line
         step_config: |
           include ::tripleo::profile::base::heat::api
-        config_image: {get_param: DockerHeatApiConfigImage}
+        config_image: {get_param: ContainerHeatApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -211,7 +211,7 @@ outputs:
           get_attr: [HeatApiLogging, docker_config, step_2]
         step_4:
           heat_api:
-            image: {get_param: DockerHeatApiImage}
+            image: {get_param: ContainerHeatApiImage}
             net: host
             privileged: false
             restart: always
@@ -244,7 +244,7 @@ outputs:
                     -
                       - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           heat_api_cron:
-            image: {get_param: DockerHeatApiImage}
+            image: {get_param: ContainerHeatApiImage}
             net: host
             user: root
             privileged: false

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Heat Engine service
 
 parameters:
-  DockerHeatEngineImage:
+  ContainerHeatEngineImage:
     description: image
     type: string
-  DockerHeatConfigImage:
+  ContainerHeatConfigImage:
     description: The container image to use for the heat config_volume
     type: string
   HeatEngineLoggingSource:
@@ -211,7 +211,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::heat::engine
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerHeatConfigImage}
+        config_image: {get_param: ContainerHeatConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_engine.json:
           command:
@@ -234,7 +234,7 @@ outputs:
           get_attr: [HeatEngineLogging, docker_config, step_2]
         step_3:
           heat_engine_db_sync:
-            image: &heat_engine_image {get_param: DockerHeatEngineImage}
+            image: &heat_engine_image {get_param: ContainerHeatEngineImage}
             net: host
             privileged: false
             detach: false

deployment/horizon/horizon-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Horizon service
 
 parameters:
-  DockerHorizonImage:
+  ContainerHorizonImage:
     description: image
     type: string
-  DockerHorizonConfigImage:
+  ContainerHorizonConfigImage:
     description: The container image to use for the horizon config_volume
     type: string
   EndpointMap:
@@ -206,7 +206,7 @@ outputs:
         puppet_tags: horizon_config
         step_config: |
           include ::tripleo::profile::base::horizon
-        config_image: {get_param: DockerHorizonConfigImage}
+        config_image: {get_param: ContainerHorizonConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/horizon.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -240,7 +240,7 @@ outputs:
       docker_config:
         step_2:
           horizon_fix_perms:
-            image: &horizon_image {get_param: DockerHorizonImage}
+            image: &horizon_image {get_param: ContainerHorizonImage}
             net: none
             user: root
             # NOTE Set ownership for /var/log/horizon/horizon.log file here,

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ironic API service
 
 parameters:
-  DockerIronicApiImage:
+  ContainerIronicApiImage:
     description: image
     type: string
-  DockerIronicApiConfigImage:
+  ContainerIronicApiConfigImage:
     description: The container image to use for the ironic_api config_volume
     type: string
   EndpointMap:
@@ -185,7 +185,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::ironic::api
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerIronicApiConfigImage}
+        config_image: {get_param: ContainerIronicApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -206,7 +206,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ironic_init_logs:
-            image: &ironic_api_image {get_param: DockerIronicApiImage}
+            image: &ironic_api_image {get_param: ContainerIronicApiImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ironic Conductor service
 
 parameters:
-  DockerIronicConductorImage:
+  ContainerIronicConductorImage:
     description: image
     type: string
-  DockerIronicConfigImage:
+  ContainerIronicConfigImage:
     description: The container image to use for the ironic config_volume
     type: string
   EndpointMap:
@@ -443,7 +443,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::ironic::conductor
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerIronicConfigImage}
+        config_image: {get_param: ContainerIronicConfigImage}
         volumes:
           - /var/lib/ironic:/var/lib/ironic:z
       kolla_config:
@@ -502,7 +502,7 @@ outputs:
               - configure_swift_temp_url
               - create_swift_temp_url_key:
                   start_order: 70
-                  image: &ironic_conductor_image {get_param: DockerIronicConductorImage}
+                  image: &ironic_conductor_image {get_param: ContainerIronicConductorImage}
                   net: host
                   detach: false
                   volumes:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ironic Inspector service (EXPERIMENTAL)
 
 parameters:
-  DockerIronicInspectorImage:
+  ContainerIronicInspectorImage:
     description: image
     type: string
-  DockerIronicInspectorConfigImage:
+  ContainerIronicInspectorConfigImage:
     description: The container image to use for the ironic_inspector config_volume
     type: string
   EndpointMap:
@@ -304,7 +304,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::ironic_inspector
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerIronicInspectorConfigImage}
+        config_image: {get_param: ContainerIronicInspectorConfigImage}
         volumes:
           - /var/lib/ironic:/var/lib/ironic:z
           - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:z
@@ -342,7 +342,7 @@ outputs:
           ironic_inspector_init_log:
             start_order: 0
             image: &ironic_inspector_image
-              get_param: DockerIronicInspectorImage
+              get_param: ContainerIronicInspectorImage
             net: none
             user: root
             volumes:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack ironic-neutron-agent service
 
 parameters:
-  DockerIronicNeutronAgentImage:
+  ContainerIronicNeutronAgentImage:
     description: The container image to use for the ironic-neutron-agent
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   ServiceData:
@@ -86,7 +86,7 @@ outputs:
         puppet_tags: neutron_config,ironic_neutron_agent_config
         step_config:
           include tripleo::profile::base::neutron::agents::networking_baremetal
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_neutron_agent.json:
           command: /usr/bin/ironic-neutron-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
@@ -103,7 +103,7 @@ outputs:
         step_4:
           ironic_neutron_agent:
             start_order: 80
-            image: {get_param: DockerIronicNeutronAgentImage}
+            image: {get_param: ContainerIronicNeutronAgentImage}
             net: host
             pid: host
             privileged: true

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Ironic PXE service
 
 parameters:
-  DockerIronicPxeImage:
+  ContainerIronicPxeImage:
     description: image
     type: string
-  DockerIronicConfigImage:
+  ContainerIronicConfigImage:
     description: The container image to use for the ironic config_volume
     type: string
   EndpointMap:
@@ -54,7 +54,7 @@ outputs:
         config_volume: ironic
         puppet_tags: ironic_config
         step_config: ''
-        config_image: {get_param: DockerIronicConfigImage}
+        config_image: {get_param: ContainerIronicConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_pxe_http.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -108,7 +108,7 @@ outputs:
         step_4:
           ironic_pxe_tftp:
             start_order: 90
-            image: &ironic_pxe_image {get_param: DockerIronicPxeImage}
+            image: &ironic_pxe_image {get_param: ContainerIronicPxeImage}
             command: ['/bin/bash', '-c', 'BIND_HOST=$(hiera ironic::pxe::tftp_bind_host -c /etc/puppet/hiera.yaml); /usr/sbin/in.tftpd --foreground --user root --address $BIND_HOST:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot']
             net: host
             privileged: false

deployment/iscsid/iscsid-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Iscsid service
 
 parameters:
-  DockerIscsidImage:
+  ContainerIscsidImage:
     description: image
     type: string
-  DockerIscsidConfigImage:
+  ContainerIscsidConfigImage:
     description: The container image to use for the iscsid config_volume
     type: string
   EndpointMap:
@@ -55,7 +55,7 @@ outputs:
         puppet_tags: iscsid_config
         step_config: |
           include ::tripleo::profile::base::iscsid
-        config_image: {get_param: DockerIscsidConfigImage}
+        config_image: {get_param: ContainerIscsidConfigImage}
         volumes:
           # NOTE(bogdando) Containerized or running on baremetal services
           # on a node must use the same iSCSI Qualified Name (IQN).
@@ -75,7 +75,7 @@ outputs:
         step_3:
           iscsid:
             start_order: 2
-            image: {get_param: DockerIscsidImage}
+            image: {get_param: ContainerIscsidImage}
             net: host
             privileged: true
             restart: always

deployment/keepalived/keepalived-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Keepalived service
 
 parameters:
-  DockerKeepalivedImage:
+  ContainerKeepalivedImage:
     description: image
     type: string
-  DockerKeepalivedConfigImage:
+  ContainerKeepalivedConfigImage:
     description: The container image to use for the keepalived config_volume
     type: string
   EndpointMap:
@@ -97,7 +97,7 @@ outputs:
         puppet_tags: 'file'
         step_config: |
           include ::tripleo::profile::base::keepalived
-        config_image: {get_param: DockerKeepalivedConfigImage}
+        config_image: {get_param: ContainerKeepalivedConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/keepalived.json:
           command: /usr/sbin/keepalived -nldD | tee -a /var/log/keepalived.log
@@ -110,7 +110,7 @@ outputs:
         step_1:
           keepalived:
             start_order: 0
-            image: {get_param: DockerKeepalivedImage}
+            image: {get_param: ContainerKeepalivedImage}
             net: host
             privileged: true
             restart: always

deployment/keystone/keystone-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Keystone service
 
 parameters:
-  DockerKeystoneImage:
+  ContainerKeystoneImage:
     description: image
     type: string
-  DockerKeystoneConfigImage:
+  ContainerKeystoneConfigImage:
     description: The container image to use for the keystone config_volume
     type: string
   EndpointMap:
@@ -653,7 +653,7 @@ outputs:
               - |
                 include ::tripleo::profile::base::keystone
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
+        config_image: &keystone_config_image {get_param: ContainerKeystoneConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/keystone.json:
           command: /usr/sbin/httpd
@@ -689,7 +689,7 @@ outputs:
           get_attr: [KeystoneLogging, docker_config, step_2]
         step_3:
           keystone_db_sync:
-            image: &keystone_image {get_param: DockerKeystoneImage}
+            image: &keystone_image {get_param: ContainerKeystoneImage}
             net: host
             user: root
             privileged: false

deployment/logging/files/barbican-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Barbican API service
 
 parameters:
-  DockerBarbicanApiImage:
+  ContainerBarbicanApiImage:
     description: image
     type: string
 
@@ -25,7 +25,7 @@ outputs:
     value:
       step_2:
         barbican_init_log:
-          image: {get_param: DockerBarbicanApiImage}
+          image: {get_param: ContainerBarbicanApiImage}
           net: none
           user: root
           volumes: *barbican_api_volumes

deployment/logging/files/heat-engine.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Glance API service
 
 parameters:
-  DockerHeatEngineImage:
+  ContainerHeatEngineImage:
     description: image
     type: string
 
@@ -21,7 +21,7 @@ outputs:
       # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
       step_2:
         heat_init_log:
-          image: {get_param: DockerHeatEngineImage}
+          image: {get_param: ContainerHeatEngineImage}
           net: none
           user: root
           volumes:

deployment/logging/files/keystone.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Keystone service
 
 parameters:
-  DockerKeystoneImage:
+  ContainerKeystoneImage:
     description: image
     type: string
 
@@ -23,7 +23,7 @@ outputs:
       step_2:
         keystone_init_log:
           start_order: 1
-          image: {get_param: DockerKeystoneImage}
+          image: {get_param: ContainerKeystoneImage}
           net: none
           user: root
           command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']

deployment/logging/files/neutron-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Neutron API service
 
 parameters:
-  DockerNeutronApiImage:
+  ContainerNeutronApiImage:
     description: image
     type: string
   NeutronServiceName:
@@ -33,7 +33,7 @@ outputs:
       # db sync runs before permissions set by kolla_config
       step_2:
         neutron_init_logs:
-          image: {get_param: DockerNeutronApiImage}
+          image: {get_param: ContainerNeutronApiImage}
           net: none
           privileged: false
           user: root

deployment/logging/files/nova-api.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova-api's logging to files
 
 parameters:
-  DockerNovaApiImage:
+  ContainerNovaApiImage:
     description: image
     type: string
   DeployIdentifier:
@@ -29,7 +29,7 @@ outputs:
       step_2:
         # db sync runs before permissions set by kolla_config
         nova_api_init_logs:
-          image: {get_param: DockerNovaApiImage}
+          image: {get_param: ContainerNovaApiImage}
           net: none
           privileged: false
           user: root

deployment/logging/files/nova-common.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova's logging to files
 
 parameters:
-  DockerNovaImage:
+  ContainerNovaImage:
     description: image
     type: string
   NovaServiceName:
@@ -46,7 +46,7 @@ outputs:
       step_2:
         map_replace:
         - CONTAINERNAME:
-            image: {get_param: DockerNovaImage}
+            image: {get_param: ContainerNovaImage}
             net: none
             privileged: false
             user: root

deployment/logging/files/nova-metadata.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova-metadata's logging to files
 
 parameters:
-  DockerNovaMetadataImage:
+  ContainerNovaMetadataImage:
     description: image
     type: string
 
@@ -22,7 +22,7 @@ outputs:
     value:
       step_2:
         nova_metadata_init_logs:
-          image: {get_param: DockerNovaMetadataImage}
+          image: {get_param: ContainerNovaMetadataImage}
           net: none
           privileged: false
           user: root

deployment/logging/files/panko-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Panko service
 
 parameters:
-  DockerPankoApiImage:
+  ContainerPankoApiImage:
     description: image
     type: string
 
@@ -25,7 +25,7 @@ outputs:
     value:
       step_2:
         panko_init_log:
-          image: {get_param: DockerPankoApiImage}
+          image: {get_param: ContainerPankoApiImage}
           net: none
           user: root
           volumes: *panko_api_volumes

deployment/logging/files/placement-api.yaml

@@ -4,7 +4,7 @@ description: >
   Template for placement's logging to files
 
 parameters:
-  DockerPlacementImage:
+  ContainerPlacementImage:
     description: image
     type: string
 
@@ -23,7 +23,7 @@ outputs:
       step_2:
         placement_init_log:
           start_order: 1
-          image: {get_param: DockerPlacementImage}
+          image: {get_param: ContainerPlacementImage}
           net: none
           user: root
           command: ['/bin/bash', '-c', 'chown -R placement:placement /var/log/placement']

deployment/logging/rsyslog-sidecar-container-puppet.yaml

@@ -4,7 +4,7 @@ description: >
   Containerized rsyslog-sidecar service
 
 parameters:
-  DockerRsyslogSidecarConfigImage:
+  ContainerRsyslogSidecarConfigImage:
     description: The container image to use for the rsyslog-sidecar config_volume
     type: string
   EndpointMap:
@@ -51,7 +51,7 @@ outputs:
         puppet_tags:  file
         step_config: |
           include ::tripleo::profile::base::rsyslog::sidecar
-        config_image: {get_param: DockerRsyslogSidecarConfigImage}
+        config_image: {get_param: ContainerRsyslogSidecarConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rsyslog_sidecar.json:
           command: /usr/sbin/rsyslogd -n

deployment/logging/stdout/barbican-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Barbican service
 
 parameters:
-  DockerBarbicanApiImage:
+  ContainerBarbicanApiImage:
     description: image
     type: string
 
@@ -23,7 +23,7 @@ outputs:
       step_2:
         barbican_api_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerBarbicanApiImage}
+          image: {get_param: ContainerBarbicanApiImage}
           user: root
           privileged: false
           restart: always
@@ -34,7 +34,7 @@ outputs:
             - BarbicanApiLogs:/var/log/
         barbican_api_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerBarbicanApiImage}
+          image: {get_param: ContainerBarbicanApiImage}
           user: root
           privileged: false
           restart: always
@@ -45,7 +45,7 @@ outputs:
             - BarbicanApiLogs:/var/log/
         barbican_api_logs:
           start_order: 2
-          image: {get_param: DockerBarbicanApiImage}
+          image: {get_param: ContainerBarbicanApiImage}
           user: barbican
           privileged: false
           restart: always

deployment/logging/stdout/haproxy.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized HAProxy API service
 
 parameters:
-  DockerRsyslogSidecarImage:
+  ContainerRsyslogSidecarImage:
     description: image
     type: string
 
@@ -19,7 +19,7 @@ outputs:
       step_1:
         haproxy_logs:
           start_order: 0
-          image: {get_param: DockerRsyslogSidecarImage}
+          image: {get_param: ContainerRsyslogSidecarImage}
           user: root
           restart: always
           volumes:

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

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Heat API CFN service
 
 parameters:
-  DockerHeatApiCfnImage:
+  ContainerHeatApiCfnImage:
     description: image
     type: string
 
@@ -20,7 +20,7 @@ outputs:
       step_2:
         heat_api_cfn_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerHeatApiCfnImage}
+          image: {get_param: ContainerHeatApiCfnImage}
           user: root
           privileged: false
           restart: always
@@ -31,7 +31,7 @@ outputs:
             - HeatApiCfnLogs:/var/log/
         heat_api_cfn_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerHeatApiCfnImage}
+          image: {get_param: ContainerHeatApiCfnImage}
           user: root
           privileged: false
           restart: always
@@ -42,7 +42,7 @@ outputs:
             - HeatApiCfnLogs:/var/log/
         heat_api_cfn_logs:
           start_order: 2
-          image: {get_param: DockerHeatApiCfnImage}
+          image: {get_param: ContainerHeatApiCfnImage}
           user: heat
           privileged: false
           restart: always

deployment/logging/stdout/heat-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Heat API service
 
 parameters:
-  DockerHeatApiImage:
+  ContainerHeatApiImage:
     description: image
     type: string
 
@@ -20,7 +20,7 @@ outputs:
       step_2:
         heat_api_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerHeatApiImage}
+          image: {get_param: ContainerHeatApiImage}
           user: root
           privileged: false
           restart: always
@@ -31,7 +31,7 @@ outputs:
             - HeatApiLogs:/var/log/
         heat_api_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerHeatApiImage}
+          image: {get_param: ContainerHeatApiImage}
           user: root
           privileged: false
           restart: always
@@ -42,7 +42,7 @@ outputs:
             - HeatApiLogs:/var/log/
         heat_api_logs:
           start_order: 2
-          image: {get_param: DockerHeatApiImage}
+          image: {get_param: ContainerHeatApiImage}
           user: heat
           privileged: false
           restart: always

deployment/logging/stdout/keystone.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Keystone service
 
 parameters:
-  DockerKeystoneImage:
+  ContainerKeystoneImage:
     description: image
     type: string
 
@@ -20,7 +20,7 @@ outputs:
       step_2:
         keystone_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerKeystoneImage}
+          image: {get_param: ContainerKeystoneImage}
           user: root
           privileged: false
           restart: always
@@ -31,7 +31,7 @@ outputs:
             - KeystoneLogs:/var/log/
         keystone_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerKeystoneImage}
+          image: {get_param: ContainerKeystoneImage}
           user: root
           privileged: false
           restart: always
@@ -42,7 +42,7 @@ outputs:
             - KeystoneLogs:/var/log/
         keystone_logs:
           start_order: 2
-          image: {get_param: DockerKeystoneImage}
+          image: {get_param: ContainerKeystoneImage}
           user: keystone
           privileged: false
           restart: always

deployment/logging/stdout/nova-api.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova-api's logging to stdout
 
 parameters:
-  DockerNovaApiImage:
+  ContainerNovaApiImage:
     description: image
     type: string
 
@@ -24,7 +24,7 @@ outputs:
       step_2:
         nova_api_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerNovaApiImage}
+          image: {get_param: ContainerNovaApiImage}
           user: root
           privileged: false
           restart: always
@@ -35,7 +35,7 @@ outputs:
             - NovaApiLogs:/var/log/
         nova_api_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerNovaApiImage}
+          image: {get_param: ContainerNovaApiImage}
           user: root
           privileged: false
           restart: always
@@ -46,7 +46,7 @@ outputs:
             - NovaApiLogs:/var/log/
         nova_api_logs:
           start_order: 2
-          image: {get_param: DockerNovaApiImage}
+          image: {get_param: ContainerNovaApiImage}
           user: nova
           privileged: false
           restart: always

deployment/logging/stdout/nova-common.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova's logging to stdout
 
 parameters:
-  DockerNovaImage:
+  ContainerNovaImage:
     description: image
     type: string
   NovaServiceName:

deployment/logging/stdout/nova-metadata.yaml

@@ -4,7 +4,7 @@ description: >
   Template for nova-metadata's logging to stdout
 
 parameters:
-  DockerNovaMetadataImage:
+  ContainerNovaMetadataImage:
     description: image
     type: string
 
@@ -24,7 +24,7 @@ outputs:
       step_2:
         nova_metadata_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerNovaMetadataImage}
+          image: {get_param: ContainerNovaMetadataImage}
           user: root
           privileged: false
           restart: always
@@ -35,7 +35,7 @@ outputs:
             - NovaMetadataLogs:/var/log/
         nova_metadata_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerNovaMetadataImage}
+          image: {get_param: ContainerNovaMetadataImage}
           user: root
           privileged: false
           restart: always
@@ -46,7 +46,7 @@ outputs:
             - NovaMetadataLogs:/var/log/
         nova_metadata_logs:
           start_order: 2
-          image: {get_param: DockerNovaMetadataImage}
+          image: {get_param: ContainerNovaMetadataImage}
           user: nova
           privileged: false
           restart: always

deployment/logging/stdout/panko-api.yaml

@@ -4,7 +4,7 @@ description: >
   OpenStack containerized Keystone service
 
 parameters:
-  DockerPankoApiImage:
+  ContainerPankoApiImage:
     description: image
     type: string
 
@@ -23,7 +23,7 @@ outputs:
       step_2:
         panko_api_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerPankoApiImage}
+          image: {get_param: ContainerPankoApiImage}
           user: root
           privileged: false
           restart: always
@@ -34,7 +34,7 @@ outputs:
             - PankoApiLogs:/var/log/
         panko_api_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerPankoApiImage}
+          image: {get_param: ContainerPankoApiImage}
           user: root
           privileged: false
           restart: always
@@ -45,7 +45,7 @@ outputs:
             - PankoApiLogs:/var/log/
         panko_api_logs:
           start_order: 2
-          image: {get_param: DockerPankoApiImage}
+          image: {get_param: ContainerPankoApiImage}
           user: panko
           privileged: false
           restart: always

deployment/logging/stdout/placement-api.yaml

@@ -4,7 +4,7 @@ description: >
   Template for placement's logging to stdout
 
 parameters:
-  DockerPlacementImage:
+  ContainerPlacementImage:
     description: image
     type: string
 
@@ -24,7 +24,7 @@ outputs:
       step_2:
         placement_apache_error_logs:
           start_order: 1
-          image: {get_param: DockerPlacementImage}
+          image: {get_param: ContainerPlacementImage}
           user: root
           privileged: false
           restart: always
@@ -35,7 +35,7 @@ outputs:
             - PlacementLogs:/var/log/
         placement_apache_access_logs:
           start_order: 1
-          image: {get_param: DockerPlacementImage}
+          image: {get_param: ContainerPlacementImage}
           user: root
           privileged: false
           restart: always
@@ -46,7 +46,7 @@ outputs:
             - PlacementLogs:/var/log/
         placement_logs:
           start_order: 2
-          image: {get_param: DockerPlacementImage}
+          image: {get_param: ContainerPlacementImage}
           user: placement
           privileged: false
           restart: always

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

@@ -4,10 +4,10 @@ description: >
   Containerized logrotate with crond for containerized service logs rotation
 
 parameters:
-  DockerCrondImage:
+  ContainerCrondImage:
     description: image
     type: string
-  DockerCrondConfigImage:
+  ContainerCrondConfigImage:
     description: The container image to use for the crond config_volume
     type: string
   EndpointMap:
@@ -91,7 +91,7 @@ outputs:
       puppet_config:
         config_volume: crond
         step_config: 'include ::tripleo::profile::base::logging::logrotate'
-        config_image: {get_param: DockerCrondConfigImage}
+        config_image: {get_param: ContainerCrondConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/logrotate-crond.json:
           command: /usr/sbin/crond -s -n
@@ -103,7 +103,7 @@ outputs:
       docker_config:
         step_4:
           logrotate_crond:
-            image: {get_param: DockerCrondImage}
+            image: {get_param: ContainerCrondImage}
             net: none
             pid: host
             privileged: true

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Manila API service
 
 parameters:
-  DockerManilaApiImage:
+  ContainerManilaApiImage:
     description: image
     type: string
-  DockerManilaConfigImage:
+  ContainerManilaConfigImage:
     description: The container image to use for the manila config_volume
     type: string
   EndpointMap:
@@ -164,7 +164,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::manila::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerManilaConfigImage}
+        config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -184,7 +184,7 @@ outputs:
       docker_config:
         step_2:
           manila_init_logs:
-            image: &manila_api_image {get_param: DockerManilaApiImage}
+            image: &manila_api_image {get_param: ContainerManilaApiImage}
             net: none
             user: root
             volumes:

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Manila Scheduler service
 
 parameters:
-  DockerManilaSchedulerImage:
+  ContainerManilaSchedulerImage:
     description: image
     type: string
-  DockerManilaConfigImage:
+  ContainerManilaConfigImage:
     description: The container image to use for the manila config_volume
     type: string
   EndpointMap:
@@ -73,7 +73,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::manila::scheduler"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerManilaConfigImage}
+        config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_scheduler.json:
           command: /usr/bin/manila-scheduler --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -89,7 +89,7 @@ outputs:
       docker_config:
         step_4:
           manila_scheduler:
-            image: {get_param: DockerManilaSchedulerImage}
+            image: {get_param: ContainerManilaSchedulerImage}
             net: host
             restart: always
             healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Manila Share service
 
 parameters:
-  DockerManilaShareImage:
+  ContainerManilaShareImage:
     description: image
     type: string
-  DockerManilaConfigImage:
+  ContainerManilaConfigImage:
     description: image
     type: string
   EndpointMap:
@@ -119,7 +119,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::manila::share"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerManilaConfigImage}
+        config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
           command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -147,7 +147,7 @@ outputs:
       docker_config:
         step_4:
           manila_share:
-            image: &manila_share_image {get_param: DockerManilaShareImage}
+            image: &manila_share_image {get_param: ContainerManilaShareImage}
             net: host
             restart: always
             volumes: {get_attr: [ManilaShareCommon, manila_share_volumes]}

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Manila Share service
 
 parameters:
-  DockerManilaShareImage:
+  ContainerManilaShareImage:
     description: image
     type: string
-  DockerManilaConfigImage:
+  ContainerManilaConfigImage:
     description: image
     type: string
   EndpointMap:
@@ -94,7 +94,7 @@ outputs:
               list_join:
                 - ':'
                 - - yaql:
-                      data: {get_param: DockerManilaShareImage}
+                      data: {get_param: ContainerManilaShareImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::manila::share_bundle::docker_volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
@@ -113,7 +113,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::pacemaker::manila"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerManilaConfigImage}
+        config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
           command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -135,7 +135,7 @@ outputs:
         step_3:
           manila_share_init_logs:
             start_order: 0
-            image: {get_param: DockerManilaShareImage}
+            image: {get_param: ContainerManilaShareImage}
             net: none
             privileged: false
             user: root
@@ -160,7 +160,7 @@ outputs:
                     'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-manila-share; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-manila-share; echo "openstack-manila-share restart invoked"; fi'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
-            image: {get_param: DockerManilaShareImage}
+            image: {get_param: ContainerManilaShareImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
@@ -183,7 +183,7 @@ outputs:
                   - puppet_debug_enabled
                   - - '--debug'
                   - - ''
-            image: {get_param: DockerManilaShareImage}
+            image: {get_param: ContainerManilaShareImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -222,7 +222,7 @@ outputs:
           import_role:
             name: tripleo-container-tag
           vars:
-            container_image: {get_param: DockerManilaShareImage}
+            container_image: {get_param: ContainerManilaShareImage}
             container_image_latest: *manila_share_image_pcmklatest
       update_tasks:
         - name: Manila-Share fetch and retag container image for pacemaker
@@ -230,7 +230,7 @@ outputs:
           block: &manila_share_fetch_retag_container_tasks
             - name: Get docker Manila-Share image
               set_fact:
-                docker_image: {get_param: DockerManilaShareImage}
+                docker_image: {get_param: ContainerManilaShareImage}
                 docker_image_latest: *manila_share_image_pcmklatest
             - name: Get previous Manila-Share image id
               shell: "{{container_cli}} images | awk '/manila-share.* pcmklatest/{print $3}' | uniq"

deployment/memcached/memcached-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Memcached services
 
 parameters:
-  DockerMemcachedImage:
+  ContainerMemcachedImage:
     description: image
     type: string
-  DockerMemcachedConfigImage:
+  ContainerMemcachedConfigImage:
     description: The container image to use for the memcached config_volume
     type: string
   EndpointMap:
@@ -152,13 +152,13 @@ outputs:
         puppet_tags: 'file'
         step_config: |
             include ::tripleo::profile::base::memcached
-        config_image: {get_param: DockerMemcachedConfigImage}
+        config_image: {get_param: ContainerMemcachedConfigImage}
       kolla_config: {}
       docker_config:
         step_1:
           memcached:
             start_order: 0
-            image: {get_param: DockerMemcachedImage}
+            image: {get_param: ContainerMemcachedImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Qpid dispatch router service
 
 parameters:
-  DockerQdrouterdImage:
+  ContainerQdrouterdImage:
     description: image
     type: string
-  DockerQdrouterdConfigImage:
+  ContainerQdrouterdConfigImage:
     description: The container image to use for the qdrouterd config_volume
     type: string
   EndpointMap:
@@ -100,7 +100,7 @@ outputs:
         config_volume: qdrouterd
         step_config: |
           include ::tripleo::profile::base::qdr
-        config_image: {get_param: DockerQdrouterdConfigImage}
+        config_image: {get_param: ContainerQdrouterdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/qdrouterd.json:
           command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
@@ -118,7 +118,7 @@ outputs:
           qdrouterd_init_logs:
             start_order: 0
             detach: false
-            image: &qdrouterd_image {get_param: DockerQdrouterdImage}
+            image: &qdrouterd_image {get_param: ContainerQdrouterdImage}
             net: none
             privileged: false
             user: root

deployment/metrics/collectd-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   Containerized collectd service
 
 parameters:
-  DockerCollectdImage:
+  ContainerCollectdImage:
     description: image
     type: string
-  DockerCollectdConfigImage:
+  ContainerCollectdConfigImage:
     description: The container image to use for the collectd config_volume
     type: string
   EndpointMap:
@@ -449,7 +449,7 @@ outputs:
         config_volume: collectd
         puppet_tags:  collectd_client_config
         step_config: include ::tripleo::profile::base::metrics::collectd
-        config_image: {get_param: DockerCollectdConfigImage}
+        config_image: {get_param: ContainerCollectdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
@@ -469,7 +469,7 @@ outputs:
       docker_config:
         step_5:
           collectd:
-            image: {get_param: DockerCollectdImage}
+            image: {get_param: ContainerCollectdImage}
             net: host
             pid: host
             privileged: true

deployment/metrics/qdr-container-puppet.yaml

@@ -4,10 +4,10 @@ description: >
   Qpid dispatch router service for metrics and monitoring purposes
 
 parameters:
-  DockerMetricsQdrImage:
+  ContainerMetricsQdrImage:
     description: image
     type: string
-  DockerMetricsQdrConfigImage:
+  ContainerMetricsQdrConfigImage:
     description: The container image to use for the qdrouterd config_volume
     type: string
   ServiceData:
@@ -229,7 +229,7 @@ outputs:
         config_volume: metrics-qdr
         step_config: |
           include ::tripleo::profile::base::metrics::qdr
-        config_image: {get_param: DockerMetricsQdrConfigImage}
+        config_image: {get_param: ContainerMetricsQdrConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/metrics-qdr.json:
           command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
@@ -258,7 +258,7 @@ outputs:
           metrics_qdr_init_logs:
             start_order: 0
             detach: false
-            image: &qdrouterd_image {get_param: DockerMetricsQdrImage}
+            image: &qdrouterd_image {get_param: ContainerMetricsQdrImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Mistral API service
 
 parameters:
-  DockerMistralApiImage:
+  ContainerMistralApiImage:
     description: image
     type: string
-  DockerMistralConfigImage:
+  ContainerMistralConfigImage:
     description: The container image to use for the mistral config_volume
     type: string
   EndpointMap:
@@ -141,7 +141,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::mistral::api
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerMistralConfigImage}
+        config_image: {get_param: ContainerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_api.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
@@ -158,7 +158,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           mistral_init_logs:
-            image: &mistral_api_image {get_param: DockerMistralApiImage}
+            image: &mistral_api_image {get_param: ContainerMistralApiImage}
             net: none
             privileged: false
             user: root

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Mistral Engine service
 
 parameters:
-  DockerMistralEngineImage:
+  ContainerMistralEngineImage:
     description: image
     type: string
-  DockerMistralConfigImage:
+  ContainerMistralConfigImage:
     description: The container image to use for the mistral config_volume
     type: string
   EndpointMap:
@@ -97,7 +97,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::mistral::engine
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerMistralConfigImage}
+        config_image: {get_param: ContainerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_engine.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine
@@ -113,7 +113,7 @@ outputs:
       docker_config:
         step_4:
           mistral_engine:
-            image: {get_param: DockerMistralEngineImage}
+            image: {get_param: ContainerMistralEngineImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Mistral Event Engine service
 
 parameters:
-  DockerMistralEventEngineImage:
+  ContainerMistralEventEngineImage:
     description: image
     type: string
-  DockerMistralConfigImage:
+  ContainerMistralConfigImage:
     description: The container image to use for the mistral config_volume
     type: string
   EndpointMap:
@@ -72,7 +72,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::mistral
               - get_attr: [MySQLClient, role_data, step_config]
-        config_image: {get_param: DockerMistralConfigImage}
+        config_image: {get_param: ContainerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_event_engine.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/event-engine.log --server=event-engine
@@ -88,7 +88,7 @@ outputs:
       docker_config:
         step_4:
           mistral_event_engine:
-            image: {get_param: DockerMistralEventEngineImage}
+            image: {get_param: ContainerMistralEventEngineImage}
             net: host
             privileged: false
             restart: always

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

@@ -4,14 +4,14 @@ description: >
   OpenStack containerized Mistral Executor service
 
 parameters:
-  DockerMistralExecutorImage:
+  ContainerMistralExecutorImage:
     description: image
     type: string
   DockerMistralExecutorUlimit:
     default: ['nofile=1024']
     description: ulimit for Mistral Executor Container
     type: comma_delimited_list
-  DockerMistralConfigImage:
+  ContainerMistralConfigImage:
     description: The container image to use for the mistral config_volume
     type: string
   EndpointMap:
@@ -113,7 +113,7 @@ outputs:
             - "\n"
             - - include ::tripleo::profile::base::mistral::executor
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerMistralConfigImage}
+        config_image: {get_param: ContainerMistralConfigImage}
         volumes:
           list_concat:
             -
@@ -140,7 +140,7 @@ outputs:
       docker_config:
         step_4:
           mistral_executor:
-            image: {get_param: DockerMistralExecutorImage}
+            image: {get_param: ContainerMistralExecutorImage}
             ulimit: {get_param: DockerMistralExecutorUlimit}
             net: host
             privileged: false

deployment/multipathd/multipathd-container.yaml

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Multipathd service
 
 parameters:
-  DockerMultipathdImage:
+  ContainerMultipathdImage:
     description: image
     type: string
-  DockerMultipathdConfigImage:
+  ContainerMultipathdConfigImage:
     description: The container image to use for the multipathd config_volume
     type: string
   EndpointMap:
@@ -53,7 +53,7 @@ outputs:
       puppet_config:
         config_volume: multipathd
         step_config: ''
-        config_image: {get_param: DockerMultipathdConfigImage}
+        config_image: {get_param: ContainerMultipathdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/multipathd.json:
           command: /usr/sbin/multipathd -d
@@ -66,7 +66,7 @@ outputs:
         step_3:
           multipathd:
             start_order: 1
-            image: {get_param: DockerMultipathdImage}
+            image: {get_param: ContainerMultipathdImage}
             net: host
             privileged: true
             restart: always

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Neutron API service
 
 parameters:
-  DockerNeutronApiImage:
+  ContainerNeutronApiImage:
     description: image
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   NeutronApiLoggingSource:
@@ -361,7 +361,7 @@ outputs:
             - "\n"
             - - include tripleo::profile::base::neutron::server
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_api.json:
           command:
@@ -394,7 +394,7 @@ outputs:
           get_attr: [NeutronLogging, docker_config, step_2]
         step_3:
           neutron_db_sync:
-            image: &neutron_api_image {get_param: DockerNeutronApiImage}
+            image: &neutron_api_image {get_param: ContainerNeutronApiImage}
             net: host
             privileged: false
             detach: false

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

@@ -30,7 +30,7 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   BgpvpnServiceProvider:
@@ -56,6 +56,6 @@ outputs:
         puppet_tags: neutron_bgpvpn_service_config
         step_config: |
           include ::tripleo::profile::base::neutron::bgpvpn
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Neutron DHCP service
 
 parameters:
-  DockerNeutronDHCPImage:
+  ContainerNeutronDHCPImage:
     description: image
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DockerNeutronDHCPAgentUlimit:
@@ -182,10 +182,10 @@ outputs:
           - get_attr: [NeutronLogging, config_settings]
           - tripleo::profile::base::neutron::dhcp_agent_wrappers::enable_dnsmasq_wrapper: {get_param: NeutronEnableDnsmasqDockerWrapper}
             tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_process_wrapper: '/var/lib/neutron/dnsmasq_wrapper'
-            tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_image: {get_param: DockerNeutronDHCPImage}
+            tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_image: {get_param: ContainerNeutronDHCPImage}
             tripleo::profile::base::neutron::dhcp_agent_wrappers::enable_haproxy_wrapper: {get_param: NeutronEnableHaproxyDockerWrapper}
             tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/dhcp_haproxy_wrapper'
-            tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: DockerNeutronDHCPImage}
+            tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: ContainerNeutronDHCPImage}
             tripleo::profile::base::neutron::dhcp_agent_wrappers::debug:
               if:
                 - service_wrapper_debug_unset
@@ -255,7 +255,7 @@ outputs:
         puppet_tags: neutron_config,neutron_dhcp_agent_config
         step_config: |
           include tripleo::profile::base::neutron::dhcp
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_dhcp.json:
           command:
@@ -300,7 +300,7 @@ outputs:
                   - '4'
                   - 'file'
                   - 'include ::tripleo::profile::base::neutron::dhcp_agent_wrappers'
-            image: {get_param: DockerNeutronDHCPImage}
+            image: {get_param: ContainerNeutronDHCPImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -310,7 +310,7 @@ outputs:
         step_4:
           neutron_dhcp:
             start_order: 10
-            image: {get_param: DockerNeutronDHCPImage}
+            image: {get_param: ContainerNeutronDHCPImage}
             net: host
             pid: host
             privileged: true

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

@@ -30,7 +30,7 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   L2gwServiceDefaultInterfaceName:
@@ -76,6 +76,6 @@ outputs:
         puppet_tags: neutron_l2gw_service_config
         step_config: |
           include tripleo::profile::base::neutron::l2gw
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Neutron L3 agent
 
 parameters:
-  DockerNeutronL3AgentImage:
+  ContainerNeutronL3AgentImage:
     description: image
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DockerNeutronL3AgentUlimit:
@@ -177,16 +177,16 @@ outputs:
             tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_process_wrapper: '/var/lib/neutron/keepalived_wrapper'
             # TODO(beagles): this can be removed after a cleanup of the related puppet-tripleo code.
             tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_state_change_wrapper: '/var/lib/neutron/keepalived_state_change_wrapper'
-            tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_image: {get_param: DockerNeutronL3AgentImage}
+            tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_image: {get_param: ContainerNeutronL3AgentImage}
             tripleo::profile::base::neutron::l3_agent_wrappers::enable_haproxy_wrapper: {get_param: NeutronEnableHaproxyDockerWrapper}
             tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/l3_haproxy_wrapper'
-            tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_image: {get_param: DockerNeutronL3AgentImage}
+            tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_image: {get_param: ContainerNeutronL3AgentImage}
             tripleo::profile::base::neutron::l3_agent_wrappers::enable_dibbler_wrapper: {get_param: NeutronEnableDibblerDockerWrapper}
             tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_process_wrapper: '/var/lib/neutron/dibbler_wrapper'
-            tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_image: {get_param: DockerNeutronL3AgentImage}
+            tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_image: {get_param: ContainerNeutronL3AgentImage}
             tripleo::profile::base::neutron::l3_agent_wrappers::enable_radvd_wrapper: {get_param: NeutronEnableRadvdDockerWrapper}
             tripleo::profile::base::neutron::l3_agent_wrappers::radvd_process_wrapper: '/var/lib/neutron/radvd_wrapper'
-            tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: DockerNeutronL3AgentImage}
+            tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: ContainerNeutronL3AgentImage}
             tripleo::profile::base::neutron::l3_agent_wrappers::debug:
               if:
                 - service_debug_unset
@@ -223,7 +223,7 @@ outputs:
         config_volume: neutron
         step_config: |
           include tripleo::profile::base::neutron::l3
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_l3_agent.json:
           command:
@@ -259,7 +259,7 @@ outputs:
                   - '4'
                   - 'file'
                   - 'include ::tripleo::profile::base::neutron::l3_agent_wrappers'
-            image: {get_param: DockerNeutronL3AgentImage}
+            image: {get_param: ContainerNeutronL3AgentImage}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@@ -269,7 +269,7 @@ outputs:
         step_4:
           neutron_l3_agent:
             start_order: 10
-            image: {get_param: DockerNeutronL3AgentImage}
+            image: {get_param: ContainerNeutronL3AgentImage}
             net: host
             pid: host
             privileged: true

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

@@ -4,10 +4,10 @@ description: >
   OpenStack containerized Neutron Metadata agent
 
 parameters:
-  DockerNeutronMetadataImage:
+  ContainerNeutronMetadataImage:
     description: image
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   NeutronMetadataAgentLoggingSource:
@@ -155,7 +155,7 @@ outputs:
         config_volume: neutron
         step_config: |
           include tripleo::profile::base::neutron::metadata
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_metadata_agent.json:
           command:
@@ -179,7 +179,7 @@ outputs:
         step_4:
           neutron_metadata_agent:
             start_order: 10
-            image: {get_param: DockerNeutronMetadataImage}
+            image: {get_param: ContainerNeutronMetadataImage}
             net: host
             pid: host
             privileged: true

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

@@ -4,10 +4,10 @@ description: >
   OpenStack Neutron openvswitch service
 
 parameters:
-  DockerOpenvswitchImage:
+  ContainerOpenvswitchImage:
     description: image
     type: string
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DockerOpenvswitchUlimit:
@@ -219,7 +219,7 @@ outputs:
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
         step_config: |
           include ::tripleo::profile::base::neutron::ovs
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
         # We need to mount /run for puppet_config step. This is because
         # puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."
         # when running vswitch::ovs::enable_hw_offload: true
@@ -256,7 +256,7 @@ outputs:
         step_3:
           neutron_ovs_bridge:
             detach: false
-            image: {get_param: DockerNeutronConfigImage}
+            image: {get_param: ContainerNeutronConfigImage}
             net: host
             pid: host
             user: root
@@ -292,7 +292,7 @@ outputs:
         step_4:
           neutron_ovs_agent:
             start_order: 10
-            image: {get_param: DockerOpenvswitchImage}
+            image: {get_param: ContainerOpenvswitchImage}
             net: host
             pid: host
             privileged: true

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

@@ -4,7 +4,7 @@ description: >
   OpenStack Neutron OVS DPDK configured with Puppet for Compute Role (Containerized)
 
 parameters:
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   ServiceData:
@@ -132,7 +132,7 @@ outputs:
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
         step_config:
           get_attr: [NeutronOvsAgent, role_data, puppet_config, step_config]
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
         # We need to mount /run for puppet_config step. This is because
         # puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."
         # when running vswitch::ovs::enable_hw_offload: true

deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml

@@ -19,7 +19,7 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DefaultPasswords:
@@ -67,6 +67,6 @@ outputs:
         puppet_tags: neutron_plugin_ml2
         step_config: |
           include ::tripleo::profile::base::neutron::plugins::ml2
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml

@@ -19,7 +19,7 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DefaultPasswords:
@@ -95,6 +95,6 @@ outputs:
         puppet_tags: neutron_plugin_ml2
         step_config: |
           include ::tripleo::profile::base::neutron::plugins::ml2
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

@@ -19,7 +19,7 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DefaultPasswords:
@@ -66,7 +66,7 @@ outputs:
         puppet_tags: {get_param: NeutronPluginMl2PuppetTags}
         step_config:
           get_attr: [NeutronBase, role_data, step_config]
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}
       host_prep_tasks: []

deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml

@@ -31,7 +31,7 @@ parameters:
       Mapping of service endpoint -> protocol. Typically set
       via parameter_defaults in the resource registry.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   MlnxSDNUsername:
@@ -80,6 +80,6 @@ outputs:
         puppet_tags: neutron_plugin_ml2
         step_config: |
           include ::tripleo::profile::base::neutron::plugins::ml2
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

deployment/neutron/neutron-plugin-nsx-container-puppet.yaml

@@ -19,7 +19,7 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
-  DockerNeutronConfigImage:
+  ContainerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
     type: string
   DefaultPasswords:
@@ -106,6 +106,6 @@ outputs:
         step_config:
           get_attr: |
             include tripleo::profile::base::neutron::plugins::nsx
-        config_image: {get_param: DockerNeutronConfigImage}
+        config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}