X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmemcached.yaml;h=7e28bdc14bb28cf4f7830ad5af463602349b9ffd;hb=951ba92f55f184fd342bc5e7af11113c6b3b10b6;hp=d85a087884fed4fe012e1c191e01d671ff4db169;hpb=1968d4042e7818ccacf49af110f60b6f617c3a82;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index d85a0878..7e28bdc1 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -4,19 +4,21 @@ description: >
   OpenStack containerized Memcached services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMemcachedImage:
     description: image
-    default: 'centos-binary-memcached:latest'
+    type: string
+  DockerMemcachedConfigImage:
+    description: The container image to use for the memcached config_volume
     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
@@ -44,6 +46,7 @@ resources:
     type: ../../puppet/services/memcached.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -63,16 +66,14 @@ outputs:
         config_volume: 'memcached'
         puppet_tags: 'file'
         step_config: *step_config
-        config_image: &memcached_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
+        config_image: {get_param: DockerMemcachedConfigImage}
       kolla_config: {}
       docker_config:
         step_1:
           memcached_init_logs:
             start_order: 0
-            image: *memcached_image
+            detach: false
+            image: &memcached_image {get_param: DockerMemcachedImage}
             privileged: false
             user: root
             volumes:
@@ -92,8 +93,6 @@ outputs:
                   - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
             # TODO(bogdando) capture memcached syslog logs from a container
             command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS']
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
         - name: Stop and disable memcached service
           tags: step2