Browse Source

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

tags/9.4.1
Zuul 1 month ago
parent
commit
305e280cab

+ 22
- 1
docker/services/nova-api.yaml View File

@@ -155,6 +155,13 @@ outputs:
155 155
               echo "(cellv2) Creating default cell_v2 cell"
156 156
               su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 create_cell --name=default"
157 157
             fi
158
+        nova_api_ensure_cell0_database_url.sh:
159
+          mode: "0700"
160
+          content:
161
+            str_replace:
162
+              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'"
163
+              params:
164
+                CELL: {get_attr: [NovaApiBase, role_data, config_settings, "nova::cell0_database_connection"]}
158 165
       docker_config:
159 166
         step_2:
160 167
           get_attr: [NovaApiLogging, docker_config, step_2]
@@ -195,11 +202,25 @@ outputs:
195 202
                   - /var/lib/docker-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
196 203
             user: root
197 204
             command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
198
-          nova_db_sync:
205
+          nova_api_ensure_cell0_database_url:
199 206
             start_order: 3
200 207
             image: *nova_api_image
201 208
             net: host
202 209
             detach: false
210
+            volumes:
211
+              list_concat:
212
+                - *nova_api_bootstrap_volumes
213
+                -
214
+                  - /var/log/containers/nova:/var/log/nova
215
+                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
216
+                  - /var/lib/docker-config-scripts/nova_api_ensure_cell0_database_url.sh:/nova_api_ensure_cell0_database_url.sh:ro
217
+            user: root
218
+            command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_cell0_database_url.sh"
219
+          nova_db_sync:
220
+            start_order: 4
221
+            image: *nova_api_image
222
+            net: host
223
+            detach: false
203 224
             volumes: *nova_api_bootstrap_volumes
204 225
             user: root
205 226
             command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage db sync'"

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