Browse Source

Merge "Update mysql url for cell0 in step3" into stable/queens

tags/8.4.1
Zuul 1 month ago
parent
commit
8c5cf23f38

+ 15
- 15
docker/services/nova-api.yaml View File

@@ -205,11 +205,25 @@ outputs:
205 205
                   - /var/lib/docker-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
206 206
             user: root
207 207
             command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
208
-          nova_db_sync:
208
+          nova_api_ensure_cell0_database_url:
209 209
             start_order: 3
210 210
             image: *nova_api_image
211 211
             net: host
212 212
             detach: false
213
+            volumes:
214
+              list_concat:
215
+                - *nova_api_bootstrap_volumes
216
+                -
217
+                  - /var/log/containers/nova:/var/log/nova
218
+                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
219
+                  - /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
220
+            user: root
221
+            command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
222
+          nova_db_sync:
223
+            start_order: 4
224
+            image: *nova_api_image
225
+            net: host
226
+            detach: false
213 227
             volumes: *nova_api_bootstrap_volumes
214 228
             user: root
215 229
             command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage db sync'"
@@ -258,20 +272,6 @@ outputs:
258 272
             environment:
259 273
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
260 274
         step_5:
261
-          nova_api_ensure_cell0_database_url:
262
-            start_order: 1
263
-            image: *nova_api_image
264
-            net: host
265
-            detach: false
266
-            volumes:
267
-              list_concat:
268
-                - *nova_api_bootstrap_volumes
269
-                -
270
-                  - /var/log/containers/nova:/var/log/nova
271
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
272
-                  - /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
273
-            user: root
274
-            command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
275 275
           nova_online_migrations:
276 276
             start_order: 2
277 277
             image: *nova_api_image

+ 5
- 0
releasenotes/notes/update-cell0-db-entry-in-step3-7484135b65c72f7b.yaml View File

@@ -0,0 +1,5 @@
1
+---
2
+fixes:
3
+  - Fixes an issue whereby TLS Everywhere brownfield deployments were
4
+    timing out because the db entry for cell0 in the database was not
5
+    being updated in step 3.  This entry is now updated in step 3.

Loading…
Cancel
Save