Using swift storage for Emergency as well. Fix: using OS_AUTH_URL_SHORT instead of OS_AUTH_URL

config/emg_mapcache-ops.xml

@@ -51,11 +51,16 @@
   <errors>empty_img</errors>
   <lock_dir>/tmp</lock_dir>
   <threaded_fetching>true</threaded_fetching>
-  <cache name="emg" type="rest">
-    <url>{{OS_STORAGE_URL}}/{{BUCKET_NAME}}/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</url>
-    <headers>
-      <X-Auth-Token>{{OS_AUTH_TOKEN}}</X-Auth-Token>
-    </headers>
+
+  <!-- Cache -->
+  <cache name="emg" type="swift">
+    <auth_url>{{OS_AUTH_URL_SHORT}}</auth_url>
+    <auth_version>{{ST_AUTH_VERSION}}</auth_version>
+    <tenant>{{OS_TENANT_ID}}</tenant>
+    <username>{{OS_USERNAME}}</username>
+    <password>{{OS_PASSWORD}}</password>
+    <container>{{BUCKET_NAME}}</container>
+    <key>/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}</key>
   </cache>
 
   <!-- SOURCES Emergency -->

config/vhr18_mapcache-ops.xml

@@ -54,7 +54,7 @@
 
   <!-- Cache -->
   <cache name="vhr18" type="swift">
-    <auth_url>{{OS_AUTH_URL}}</auth_url>
+    <auth_url>{{OS_AUTH_URL_SHORT}}</auth_url>
     <auth_version>{{ST_AUTH_VERSION}}</auth_version>
     <tenant>{{OS_TENANT_ID}}</tenant>
     <username>{{OS_USERNAME}}</username>