X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fsahara-api.yaml;h=bff2fdace8a932a303fc4a6ca280e8a012527936;hb=e57a7cdd733c5edd974749cd21e0563c8c6ca9fa;hp=10670796be0c332f7cbb6fdb5ccf3471ab4855c6;hpb=0354927a1143dd766cab4b9a88d4af84e404d6d9;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index 10670796..bff2fdac 100644
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -4,19 +4,21 @@ 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
     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/sahara-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
 
@@ -64,13 +67,15 @@ 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: &sahara_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
+        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
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/lib/sahara
               owner: sahara:sahara
@@ -81,15 +86,15 @@ outputs:
       docker_config:
         step_3:
           sahara_db_sync:
-            image: *sahara_image
+            image: &sahara_api_image {get_param: DockerSaharaApiImage}
             net: host
             privileged: false
             detach: false
-            volumes: &sahara_volumes
+            user: root
+            volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json
                   - /var/lib/config-data/sahara/etc/sahara/:/etc/sahara/:ro
                   - /lib/modules:/lib/modules:ro
                   - /var/lib/sahara:/var/lib/sahara
@@ -97,11 +102,19 @@ outputs:
             command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'"
         step_4:
           sahara_api:
-            image: *sahara_image
+            image: *sahara_api_image
             net: host
             privileged: false
             restart: always
-            volumes: *sahara_volumes
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json
+                  - /var/lib/config-data/puppet-generated/sahara/:/var/lib/kolla/config_files/src:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /var/lib/sahara:/var/lib/sahara
+                  - /var/log/containers/sahara:/var/log/sahara
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: