1 files changed, 29 insertions, 26 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index b8ab9622..0b4f81ed 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GlanceApiPuppetBase:
     type: ../../puppet/services/glance-api.yaml
     properties:
@@ -45,28 +48,21 @@ outputs:
         map_merge:
           - get_attr: [GlanceApiPuppetBase, role_data, config_settings]
           - glance::api::sync_db: false
-      step_config: {get_attr: [GlanceApiPuppetBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [GlanceApiPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
-      docker_image: &glance_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
-      puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
-      config_volume: glance_api
-      config_image: *glance_image
+      puppet_config:
+        config_volume: glance_api
+        puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
+        step_config: *step_config
+        config_image: &glance_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/glance-api.json:
-           command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
-           config_files:
-           - dest: /etc/glance/glance-api.conf
-             owner: glance
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/glance/glance-api.conf
-           - dest: /etc/glance/glance-swift.conf
-             owner: glance
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/glance/glance-swift.conf
+        /var/lib/kolla/config_files/glance-api.json:
+          command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
       docker_config:
         step_3:
           glance_api_db_sync:
@@ -75,13 +71,16 @@ outputs:
             privileged: false
             detach: false
             volumes: &glance_volumes
-              - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
-              - /etc/localtime:/etc/localtime:ro
-              - /lib/modules:/lib/modules:ro
-              - /var/lib/config-data/glance_api/:/var/lib/kolla/config_files/src:ro
-              - /run:/run
-              - /dev:/dev
-              - /etc/hosts:/etc/hosts:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
+                    - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
+                    - /dev:/dev
             environment:
               - KOLLA_BOOTSTRAP=True
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
@@ -94,3 +93,7 @@ outputs:
             volumes: *glance_volumes
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable glance_api service
+          tags: step2
+          service: name=openstack-glance-api state=stopped enabled=no