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

docker/services/nova-api.yaml

@@ -155,6 +155,13 @@ outputs:
               echo "(cellv2) Creating default cell_v2 cell"
               su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 create_cell --name=default"
             fi
+        nova_api_ensure_cell0_database_url.sh:
+          mode: "0700"
+          content:
+            str_replace:
+              template: su nova -s /bin/bash -c "nova-manage cell_v2 list_cells --verbose | grep 'CELL' || nova-manage cell_v2 update_cell --cell_uuid 00000000-0000-0000-0000-000000000000 --transport-url 'none:///' --database_connection='CELL'"
+              params:
+                CELL: {get_attr: [NovaApiBase, role_data, config_settings, "nova::cell0_database_connection"]}
       docker_config:
         step_2:
           get_attr: [NovaApiLogging, docker_config, step_2]
@@ -195,11 +202,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'"

releasenotes/notes/update-cell0-db-entry-in-step3-9af22193c34e7edd.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.