X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fsahara-api.yaml;fp=docker%2Fservices%2Fsahara-api.yaml;h=906fe695f9233b2063b0024ace1c431205993809;hb=e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c;hp=8d10165786ddd3f2503622ac828c21467de38868;hpb=d1fcf403dc85b25882c25d36b36ea97b56f05186;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index 8d101657..906fe695 100644
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Sahara service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSaharaApiImage:
     description: image
-    default: 'centos-binary-sahara-api:latest'
     type: string
   DockerSaharaConfigImage:
     description: The container image to use for the sahara config_volume
-    default: 'centos-binary-sahara-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -68,10 +62,7 @@ outputs:
         config_volume: sahara
         puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
+        config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sahara-api.json:
           command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf
@@ -90,10 +81,7 @@ outputs:
       docker_config:
         step_3:
           sahara_db_sync:
-            image: &sahara_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
+            image: &sahara_api_image {get_param: DockerSaharaApiImage}
             net: host
             privileged: false
             detach: false