X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-conductor.yaml;h=9f66657773b3851def9bf65728846bd5b0928e81;hb=ad370ba063d4e5b97dc446b33abea44c61908cd1;hp=35c361fd3732e49acd2b8b0a4e413cb57beea000;hpb=69ef806c798598b4d90406644f39e5280de55f23;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 35c361fd..9f666577 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Nova Conductor service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaConductorImage:
     description: image
-    default: 'centos-binary-nova-conductor:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -49,6 +47,7 @@ resources:
     type: ../../puppet/services/nova-conductor.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -68,10 +67,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_conductor.json:
           command: /usr/bin/nova-conductor
@@ -87,10 +83,7 @@ outputs:
       docker_config:
         step_4:
           nova_conductor:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ]
+            image: {get_param: DockerNovaConductorImage}
             net: host
             privileged: false
             restart: always