X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Ftacker.yaml;h=cdcb4d2ac51cb20e667a054105295dfe90c2d0e3;hb=511d34eedca27756cfbbfdd6b0e43d916745367a;hp=793a1743e766fc8dd94b1da329c9d768edda1774;hpb=5b2395a2ed7c5eb0b4f1b5c01467a6c5c095867b;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 793a1743..cdcb4d2a 100644
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Tacker service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerTackerImage:
     description: image
-    default: 'centos-binary-tacker:latest'
     type: string
   DockerTackerConfigImage:
     description: The container image to use for the tacker config_volume
-    default: 'centos-binary-tacker: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
@@ -48,6 +46,7 @@ resources:
     type: ../../puppet/services/tacker.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -69,10 +68,7 @@ outputs:
         config_volume: tacker
         puppet_tags: tacker_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerTackerConfigImage} ]
+        config_image: {get_param: DockerTackerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/tacker_api.json:
           command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
@@ -89,10 +85,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           tacker_init_logs:
-            image: &tacker_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerTackerImage} ]
+            image: &tacker_image {get_param: DockerTackerImage}
             privileged: false
             user: root
             volumes: