Merge "Nic config mappings for deployed-server"

[apex-tripleo-heat-templates.git] / docker / services / nova-conductor.yaml

diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 8bc81e3..f85cf54 100644 (file)
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -12,7 +12,7 @@ parameters:
     description: image
     default: 'centos-binary-nova-conductor:latest'
     type: string
-  DockerNovaBaseImage:
+  DockerNovaConfigImage:
     description: image
     default: 'centos-binary-nova-base:latest'
     type: string
@@ -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
@@ -62,7 +58,7 @@ outputs:
         config_image:
           list_join:
           - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
          /var/lib/kolla/config_files/nova_conductor.json:
            command: /usr/bin/nova-conductor
@@ -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