X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Foctavia-housekeeping.yaml;fp=docker%2Fservices%2Foctavia-housekeeping.yaml;h=6f92d0a5adf1d5b79cbd1d9a248df6733f7f1cea;hb=e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c;hp=be2c445dee4ef270e51c3d0d388b4ebb367652bd;hpb=d1fcf403dc85b25882c25d36b36ea97b56f05186;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index be2c445d..6f92d0a5 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Octavia service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaHousekeepingImage:
     description: image
-    default: 'centos-binary-octavia-housekeeping:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -68,10 +62,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:
           command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
@@ -84,10 +75,7 @@ outputs:
         step_2:
           octavia_housekeeping_init_dirs:
             start_order: 0
-            image: &octavia_housekeeping_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
+            image: &octavia_housekeeping_image {get_param: DockerOctaviaHousekeepingImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d