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

docker/services/nova-api.yaml

@@ -205,11 +205,25 @@ outputs:
                   - /var/lib/docker-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
             user: root
             command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
-          nova_db_sync:
+          nova_api_ensure_cell0_database_url:
             start_order: 3
             image: *nova_api_image
             net: host
             detach: false
+            volumes:
+              list_concat:
+                - *nova_api_bootstrap_volumes
+                -
+                  - /var/log/containers/nova:/var/log/nova
+                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
+            user: root
+            command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
+          nova_db_sync:
+            start_order: 4
+            image: *nova_api_image
+            net: host
+            detach: false
             volumes: *nova_api_bootstrap_volumes
             user: root
             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:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
         step_5:
-          nova_api_ensure_cell0_database_url:
-            start_order: 1
-            image: *nova_api_image
-            net: host
-            detach: false
-            volumes:
-              list_concat:
-                - *nova_api_bootstrap_volumes
-                -
-                  - /var/log/containers/nova:/var/log/nova
-                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
-            user: root
-            command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
           nova_online_migrations:
             start_order: 2
             image: *nova_api_image

releasenotes/notes/update-cell0-db-entry-in-step3-7484135b65c72f7b.yaml

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