Remove docker_image sections (unused)

We don't use docker_image for anything. It is a remant of the pre-composable docker templates and we can now remove it. This patch removes references to the 'docker_image' section from docker/post.yaml and all of the docker/services* templates. Change-Id: I208c1ef1550ab39ab0ee47ab282f9b1937379810
2017-03-06 13:58:10 -05:00 · 2017-03-06 13:58:10 -05:00 · ab83e7731c
commit ab83e7731c
parent 78b7a7ed8a
35 changed files with 129 additions and 166 deletions
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@ -159,12 +159,12 @@ resources:
      value:
        yaql:
          expression:
-            # select 'step_config' only from services that do not have a docker_image
-            $.data.service_names.zip($.data.step_config, $.data.docker_image).where($[2] = null).where($[1] != null).select($[1]).join("\n")
+            # select 'step_config' only from services that do not have a docker_config
+            $.data.service_names.zip($.data.step_config, $.data.docker_config).where($[2] = null).where($[1] != null).select($[1]).join("\n")
          data:
            service_names: {get_param: [role_data, {{role.name}}, service_names]}
            step_config: {get_param: [role_data, {{role.name}}, step_config]}
-            docker_image: {get_param: [role_data, {{role.name}}, docker_image]}
+            docker_config: {get_param: [role_data, {{role.name}}, docker_config]}

  {{role.name}}DockerConfig:
    type: OS::Heat::Value
@ -173,12 +173,11 @@ resources:
      value:
        yaql:
          expression:
-            # select 'docker_config' only from services that have a docker_image
-            $.data.service_names.zip($.data.docker_config, $.data.docker_image).where($[2] != null).select($[1]).reduce($1.mergeWith($2), {})
+            # select 'docker_config' only from services that have it
+            $.data.service_names.zip($.data.docker_config).where($[1] != null).select($[1]).reduce($1.mergeWith($2), {})
          data:
            service_names: {get_param: [role_data, {{role.name}}, service_names]}
            docker_config: {get_param: [role_data, {{role.name}}, docker_config]}
-            docker_image: {get_param: [role_data, {{role.name}}, docker_image]}

  # Here we are dumping all the docker container startup configuration data
  # so that we can have access to how they are started outside of heat
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@ -58,8 +58,6 @@ are re-asserted when applying latter ones.
   the container itself at the /var/lib/kolla/config_files/config.json
   location and drives how kolla's external config mechanisms work.

- * docker_image: The full name of the docker image that will be used.
-
 * docker_config: Data that is passed to the docker-cmd hook to configure
   a container, or step of containers at each step. See the available steps
   below and the related docker-cmd hook documentation in the heat-agents
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@ -51,15 +51,14 @@ outputs:
          - - "['Mongodb_database', 'Mongodb_user', 'Mongodb_replset'].each |String $val| { noop_resource($val) }"
            - {get_attr: [MongodbPuppetBase, role_data, step_config]}
      # BEGIN DOCKER SETTINGS #
-      docker_image: &mongodb_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
      puppet_config:
        config_volume: mongodb
        puppet_tags: file # set this even though file is the default
        step_config: *step_config
-        config_image: *mongodb_image
+        config_image: &mongodb_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
      kolla_config:
        /var/lib/kolla/config_files/mongodb.json:
          command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@ -60,15 +60,14 @@ outputs:
          - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
            - {get_attr: [MysqlPuppetBase, role_data, step_config]}
      # BEGIN DOCKER SETTINGS #
-      docker_image: &mysql_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
      puppet_config:
        config_volume: mysql
        puppet_tags: file # set this even though file is the default
        step_config: *step_config
-        config_image: *mysql_image
+        config_image: &mysql_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
      kolla_config:
        /var/lib/kolla/config_files/mysql.json:
          command: /usr/bin/mysqld_safe
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@ -49,15 +49,14 @@ outputs:
        get_attr: [GlanceApiPuppetBase, role_data, step_config]
      service_config_settings: {get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS #
-      docker_image: &glance_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
      puppet_config:
        config_volume: glance_api
        puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
        step_config: *step_config
-        config_image: *glance_image
+        config_image: &glance_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
      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
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@ -55,10 +55,6 @@ outputs:
        get_attr: [HeatBase, role_data, step_config]
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &heat_api_cfn_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ]
      puppet_config:
        config_volume: heat
        puppet_tags: heat_config,file,concat,file_line
@ -78,7 +74,10 @@ outputs:
      docker_config:
        step_4:
          heat_api_cfn:
-            image: *heat_api_cfn_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@ -55,10 +55,6 @@ outputs:
        get_attr: [HeatBase, role_data, step_config]
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &heat_api_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiImage} ]
      puppet_config:
        config_volume: heat
        puppet_tags: heat_config,file,concat,file_line
@ -78,7 +74,10 @@ outputs:
      docker_config:
        step_4:
          heat_api:
-            image: *heat_api_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@ -50,15 +50,14 @@ outputs:
        get_attr: [HeatBase, role_data, step_config]
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &heat_engine_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
      puppet_config:
        config_volume: heat
        puppet_tags: heat_config,file,concat,file_line
        step_config: *step_config
-        config_image: *heat_engine_image
+        config_image: &heat_engine_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
      kolla_config:
         /var/lib/kolla/config_files/heat_engine.json:
           command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@ -52,10 +52,6 @@ outputs:
        get_attr: [IronicApiBase, role_data, step_config]
      service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &ironic_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
      puppet_config:
        config_volume: ironic
        puppet_tags: ironic_config
@ -75,7 +71,10 @@ outputs:
      docker_config:
        step_3:
          ironic_db_sync:
-            image: *ironic_image
+            image: &ironic_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
            net: host
            privileged: false
            detach: false
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@ -59,10 +59,6 @@ outputs:
        get_attr: [IronicConductorBase, role_data, step_config]
      service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &ironic_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ]
      puppet_config:
        config_volume: ironic
        puppet_tags: ironic_config
@ -89,7 +85,10 @@ outputs:
      docker_config:
        step_4:
          ironic-init-dirs:
-            image: *ironic_image
+            image: &ironic_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ]
            user: root
            command: ['/bin/bash', '-c', 'mkdir /var/lib/ironic/httpboot && mkdir /var/lib/ironic/tftpboot']
            volumes:
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@ -40,10 +40,6 @@ outputs:
      step_config: &step_config ''
      service_config_settings: {}
      # BEGIN DOCKER SETTINGS
-      docker_image: &ironic_pxe_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
      puppet_config:
        config_volume: ironic
        puppet_tags: ironic_config
@ -103,7 +99,10 @@ outputs:
        step_4:
          ironic_pxe_tftp:
            start_order: 90
-            image: *ironic_pxe_image
+            image: &ironic_pxe_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@ -56,15 +56,14 @@ outputs:
            - {get_attr: [KeystoneBase, role_data, step_config]}
      service_config_settings: {get_attr: [KeystoneBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &keystone_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
      puppet_config:
        config_volume: keystone
        puppet_tags: keystone_config
        step_config: *step_config
-        config_image: *keystone_image
+        config_image: &keystone_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
      kolla_config:
         /var/lib/kolla/config_files/keystone.json:
           command: /usr/sbin/httpd -DFOREGROUND
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@ -46,15 +46,14 @@ outputs:
        get_attr: [MemcachedBase, role_data, step_config]
      service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &memcached_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
      puppet_config:
        config_volume: 'memcached'
        puppet_tags: 'file'
        step_config: *step_config
-        config_image: *memcached_image
+        config_image: &memcached_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
      kolla_config: {}
      docker_config:
        step_1:
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@ -52,10 +52,6 @@ outputs:
        get_attr: [MistralApiBase, role_data, step_config]
      service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &mistral_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
@ -76,7 +72,10 @@ outputs:
        step_3:
          mistral_db_sync:
            start_order: 1
-            image: *mistral_image
+            image: &mistral_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
            net: host
            privileged: false
            detach: false
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@ -53,10 +53,6 @@ outputs:
        get_attr: [MistralBase, role_data, step_config]
      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &mistral_engine_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMistralEngineImage} ]
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
@ -76,7 +72,10 @@ outputs:
      docker_config:
        step_4:
          mistral_engine:
-            image: *mistral_engine_image
+            image: &mistral_engine_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMistralEngineImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@ -53,10 +53,6 @@ outputs:
        get_attr: [MistralBase, role_data, step_config]
      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &mistral_executor_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
@ -76,7 +72,10 @@ outputs:
      docker_config:
        step_4:
          mistral_executor:
-            image: *mistral_executor_image
+            image: &mistral_executor_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@ -53,10 +53,6 @@ outputs:
        get_attr: [NeutronBase, role_data, step_config]
      service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &neutron_api_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
      puppet_config:
        config_volume: neutron
        puppet_tags: neutron_config,neutron_api_config
@ -80,7 +76,10 @@ outputs:
      docker_config:
        step_3:
          neutron_db_sync:
-            image: *neutron_api_image
+            image: &neutron_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
            net: host
            privileged: false
            detach: false
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@ -53,10 +53,6 @@ outputs:
        get_attr: [NeutronBase, role_data, step_config]
      service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &neutron_dhcp_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
      puppet_config:
        config_volume: neutron
        puppet_tags: neutron_config,neutron_dhcp_agent_config
@ -80,7 +76,10 @@ outputs:
      docker_config:
        step_4:
          neutron_dhcp:
-            image: *neutron_dhcp_image
+            image: &neutron_dhcp_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
            net: host
            pid: host
            privileged: true
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@ -49,11 +49,6 @@ outputs:
      config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
      step_config: &step_config
        get_attr: [NeutronL3Base, role_data, step_config]
-      docker_image: &neutron_l3_agent_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
-
      puppet_config:
        puppet_tags: neutron_config,neutron_l3_agent_config
        config_volume: neutron
@ -77,7 +72,10 @@ outputs:
      docker_config:
        step_4:
          neutronl3agent:
-            image: *neutron_l3_agent_image
+            image: &neutron_l3_agent_image
+              list_join:
+              - '/'
+              - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
            net: host
            pid: host
            privileged: true
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@ -44,15 +44,14 @@ outputs:
      config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]}
      step_config: &step_config
        get_attr: [NeutronOvsAgentBase, role_data, step_config]
-      docker_image: &neutron_ovs_agent_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
      puppet_config:
        config_volume: neutron
        puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
        step_config: *step_config
-        config_image: *neutron_ovs_agent_image
+        config_image: &neutron_ovs_agent_image
+          list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
      kolla_config:
        /var/lib/kolla/config_files/neutron-openvswitch-agent.json:
           command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@ -48,14 +48,13 @@ outputs:
        get_attr: [NeutronBase, role_data, step_config]
      service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &docker_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
      puppet_config:
        config_volume: 'neutron'
        puppet_tags: ''
        step_config: *step_config
-        config_image: *docker_image
+        config_image:
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
      kolla_config: {}
      docker_config: {}
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@ -53,10 +53,6 @@ outputs:
        get_attr: [NovaApiBase, role_data, step_config]
      service_config_settings: {get_attr: [NovaApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &nova_api_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaApiImage} ]
      puppet_config:
        config_volume: nova
        puppet_tags: nova_config
@ -77,7 +73,10 @@ outputs:
        step_3:
          nova_api_db_sync:
            start_order: 1
-            image: *nova_api_image
+            image: &nova_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNovaApiImage} ]
            net: host
            detach: false
            volumes: &nova_api_volumes
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@ -45,15 +45,14 @@ outputs:
      config_settings: {get_attr: [NovaComputeBase, role_data, config_settings]}
      step_config: &step_config
        get_attr: [NovaComputeBase, role_data, step_config]
-      docker_image: &nova_compute_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
      puppet_config:
        config_volume: nova_libvirt
        puppet_tags: nova_config,nova_paste_api_ini
        step_config: *step_config
-        config_image: *nova_compute_image
+        config_image: &nova_compute_image
+          list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
      kolla_config:
        /var/lib/kolla/config_files/nova-compute.json:
           command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@ -51,10 +51,6 @@ outputs:
        get_attr: [NovaConductorBase, role_data, step_config]
      service_config_settings: {get_attr: [NovaConductorBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &nova_conductor_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ]
      puppet_config:
        config_volume: nova
        puppet_tags: nova_config
@ -74,7 +70,10 @@ outputs:
      docker_config:
        step_4:
          nova_conductor:
-            image: *nova_conductor_image
+            image: &nova_conductor_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@ -47,10 +47,6 @@ outputs:
      config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
      step_config: &step_config
        get_attr: [NovaIronicBase, role_data, step_config]
-      docker_image: &nova_ironic_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
      puppet_config:
        config_volume: nova
        puppet_tags: nova_config,nova_paste_api_ini
@ -74,7 +70,10 @@ outputs:
      docker_config:
        step_5:
          novacompute:
-            image: *nova_ironic_image
+            image:
+              list_join:
+              - '/'
+              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
            net: host
            privileged: true
            user: root
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@ -50,10 +50,6 @@ outputs:
      config_settings: {get_attr: [NovaLibvirtBase, role_data, config_settings]}
      step_config: &step_config
        get_attr: [NovaLibvirtBase, role_data, step_config]
-      docker_image: &libvirt_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ]
      puppet_config:
        config_volume: nova_libvirt
        puppet_tags: nova_config
@ -73,7 +69,10 @@ outputs:
      docker_config:
        step_3:
          nova_libvirt:
-            image: *libvirt_image
+            image:
+              list_join:
+              - '/'
+              - [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ]
            net: host
            pid: host
            privileged: true
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@ -41,7 +41,6 @@ outputs:
        get_attr: [NovaMetadataBase, role_data, step_config]
      service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: ''
      puppet_config:
        config_volume: ''
        puppet_tags: ''
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@ -49,10 +49,6 @@ outputs:
        get_attr: [NovaPlacementBase, role_data, step_config]
      service_config_settings: {get_attr: [NovaPlacementBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &nova_placement_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
      puppet_config:
        config_volume: nova_placement
        puppet_tags: nova_config
@ -96,7 +92,10 @@ outputs:
        step_3:
          nova_placement:
            start_order: 1
-            image: *nova_placement_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
            net: host
            user: root
            restart: always
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@ -50,10 +50,6 @@ outputs:
        get_attr: [NovaSchedulerBase, role_data, step_config]
      service_config_settings: {get_attr: [NovaSchedulerBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &nova_scheduler_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ]
      puppet_config:
        config_volume: nova
        puppet_tags: nova_config
@ -73,7 +69,10 @@ outputs:
      docker_config:
        step_4:
          nova_scheduler:
-            image: *nova_scheduler_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ]
            net: host
            privileged: false
            restart: always
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@ -50,15 +50,14 @@ outputs:
        get_attr: [RabbitmqBase, role_data, step_config]
      service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &rabbitmq_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
      puppet_config:
        config_volume: rabbitmq
        puppet_tags: file
        step_config: *step_config
-        config_image: *rabbitmq_image
+        config_image: &rabbitmq_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
      kolla_config:
        /var/lib/kolla/config_files/rabbitmq.json:
          command: /usr/lib/rabbitmq/bin/rabbitmq-server
--- a/docker/services/services.yaml
+++ b/docker/services/services.yaml
@ -67,7 +67,6 @@ outputs:
        {get_attr: [PuppetServices, role_data, global_config_settings]}
      step_config:
        {get_attr: [ServiceChain, role_data, step_config]}
-      docker_image: {get_attr: [ServiceChain, role_data, docker_image]}
      puppet_config: {get_attr: [ServiceChain, role_data, puppet_config]}
      kolla_config:
        map_merge: {get_attr: [ServiceChain, role_data, kolla_config]}
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@ -46,15 +46,14 @@ outputs:
        get_attr: [SwiftProxyBase, role_data, step_config]
      service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &swift_proxy_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      puppet_config:
        config_volume: swift
        puppet_tags: swift_proxy_config
        step_config: *step_config
-        config_image: *swift_proxy_image
+        config_image: &swift_proxy_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      kolla_config:
        /var/lib/kolla/config_files/swift_proxy.json:
          command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@ -70,14 +70,13 @@ outputs:
        get_attr: [SwiftRingbuilderBase, role_data, step_config]
      service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &docker_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      puppet_config:
        config_volume: 'swift'
        puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance
        step_config: *step_config
-        config_image: *docker_image
+        config_image:
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      kolla_config: {}
      docker_config: {}
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@ -58,15 +58,14 @@ outputs:
        get_attr: [SwiftStorageBase, role_data, step_config]
      service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &swift_proxy_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      puppet_config:
        config_volume: swift
        puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
        step_config: *step_config
-        config_image: *swift_proxy_image
+        config_image:
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
      kolla_config:
        /var/lib/kolla/config_files/swift_account_auditor.json:
          command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@ -46,15 +46,14 @@ outputs:
       get_attr: [ZaqarBase, role_data, step_config]
      service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
-      docker_image: &zaqar_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
      puppet_config:
        config_volume: zaqar
        puppet_tags: zaqar_config
        step_config: *step_config
-        config_image: *zaqar_image
+        config_image: &zaqar_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
      kolla_config:
        /var/lib/kolla/config_files/zaqar.json:
          command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf