X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fglance-api.yaml;h=4fadef9597f781ef80ceee3f0aa3baa38fed738d;hb=3786c93e21a48c2b42033138a53f6d9036e88deb;hp=c3af52315ee24495b38854e986095d9c42b89056;hpb=f2331fe312fa935872a0d469ca9e1cd9eee17ca3;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index c3af5231..4fadef95 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-glance-api:latest'
     type: string
+  DockerGlanceApiConfigImage:
+    description: The container image to use for the glance_api config_volume
+    default: 'centos-binary-glance-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -74,10 +78,10 @@ outputs:
         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
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiConfigImage} ]
       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
@@ -85,18 +89,20 @@ outputs:
           command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
-        step_3:
+        step_2:
           glance_init_logs:
-            start_order: 0
-            image: *glance_image
+            image: &glance_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
             privileged: false
             user: root
             volumes:
               - /var/log/containers/glance:/var/log/glance
             command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance']
+        step_3:
           glance_api_db_sync:
-            start_order: 1
-            image: *glance_image
+            image: *glance_api_image
             net: host
             privileged: false
             detach: false
@@ -116,7 +122,7 @@ outputs:
           map_merge:
             - glance_api:
                 start_order: 2
-                image: *glance_image
+                image: *glance_api_image
                 net: host
                 privileged: false
                 restart: always
@@ -127,7 +133,7 @@ outputs:
                 - internal_tls_enabled
                 - glance_api_tls_proxy:
                     start_order: 2
-                    image: *glance_image
+                    image: *glance_api_image
                     net: host
                     user: root
                     restart: always