X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmanila-api.yaml;h=c33f40942c16ec113c49974076979506696953f4;hb=1bb56bce55845ddf0c2a0d330c46b0fd03f9036c;hp=66dc6c3c7dab2934092981c29f70316baa39dc56;hpb=a474ae82d5f157a48c997fb9df420442bd79dcbe;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index 66dc6c3c..c33f4094 100644
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Manila API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerManilaApiImage:
     description: image
-    default: 'centos-binary-manila-api:latest'
     type: string
   DockerManilaConfigImage:
     description: The container image to use for the manila config_volume
-    default: 'centos-binary-manila-api: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/manila-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
 
@@ -65,13 +64,15 @@ outputs:
         config_volume: manila
         puppet_tags: manila_config,manila_api_paste_ini
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+        config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_api.json:
           command: /usr/bin/manila-api --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/manila
               owner: manila:manila
@@ -79,10 +80,7 @@ outputs:
       docker_config:
         step_2:
           manila_init_logs:
-            image: &manila_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerManilaApiImage} ]
+            image: &manila_api_image {get_param: DockerManilaApiImage}
             user: root
             volumes:
               - /var/log/containers/manila:/var/log/manila
@@ -110,7 +108,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/manila_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/manila/etc/manila/:/etc/manila/:ro
+                  - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/manila:/var/log/manila
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS