Browse Source

Merge "Remove pre-upgrade best-effort online data migrations" into stable/stein

tags/10.6.1
Zuul 3 weeks ago
parent
commit
bd4c2fa3f7

+ 0
- 17
deployment/cinder/cinder-api-container-puppet.yaml View File

@@ -353,23 +353,6 @@ outputs:
353 353
               Log files from cinder containers can be found under
354 354
               /var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
355 355
           ignore_errors: true
356
-      upgrade_tasks:
357
-        - when: step|int == 0
358
-          tags: common
359
-          block:
360
-            - name: set is_cinder_api_bootstrap_node fact
361
-              set_fact: is_cinder_api_bootstrap_node={{cinder_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
362
-            - name: Ensure all online data migrations for Cinder have been applied
363
-              shell: |
364
-                if {{ container_cli }} ps | grep cinder_api; then
365
-                  {{ container_cli }} exec cinder_api cinder-manage db online_data_migrations
366
-                # handle situation when container_cli is podman but
367
-                # the containers are still under docker
368
-                elif docker ps | grep cinder_api; then
369
-                  docker exec cinder_api cinder-manage db online_data_migrations
370
-                fi
371
-              tags: pre-upgrade
372
-              when: is_cinder_api_bootstrap_node|bool
373 356
       post_upgrade_tasks:
374 357
         - when: step|int == 1
375 358
           import_role:

+ 0
- 17
deployment/ironic/ironic-api-container-puppet.yaml View File

@@ -277,23 +277,6 @@ outputs:
277 277
               Log files from ironic containers can be found under
278 278
               /var/log/containers/ironic and /var/log/containers/httpd/ironic-*.
279 279
           ignore_errors: true
280
-      upgrade_tasks:
281
-        - when: step|int == 0
282
-          tags: common
283
-          block:
284
-            - name: set is_ironic_api_bootstrap_node fact
285
-              set_fact: is_ironic_api_bootstrap_node={{ironic_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
286
-            - name: Ensure all online data migrations for Ironic have been applied
287
-              shell: |
288
-                if {{ container_cli }} ps | grep ironic_api; then
289
-                  {{ container_cli }} exec ironic_api ironic-dbsync --config-file /etc/ironic/ironic.conf online_data_migrations
290
-                # handle situation when container_cli is podman but
291
-                # the containers are still under docker
292
-                elif docker ps | grep ironic_api; then
293
-                  docker exec ironic_api ironic-dbsync --config-file /etc/ironic/ironic.conf online_data_migrations
294
-                fi
295
-              tags: pre-upgrade
296
-              when: is_ironic_api_bootstrap_node|bool
297 280
       external_upgrade_tasks:
298 281
         - when: step|int == 1
299 282
           block:

+ 0
- 17
deployment/nova/nova-api-container-puppet.yaml View File

@@ -467,23 +467,6 @@ outputs:
467 467
       metadata_settings:
468 468
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
469 469
       host_prep_tasks: {get_attr: [NovaApiLogging, host_prep_tasks]}
470
-      upgrade_tasks:
471
-        - when: step|int == 0
472
-          tags: common
473
-          block:
474
-            - name: set is_nova_api_bootstrap_node fact
475
-              set_fact: is_nova_api_bootstrap_node={{nova_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
476
-            - name: Ensure all online data migrations for Nova have been applied
477
-              shell: |
478
-                if {{ container_cli }} ps | grep nova_api; then
479
-                  {{ container_cli }} exec nova_api nova-manage db online_data_migrations
480
-                # handle situation when container_cli is podman but
481
-                # the containers are still under docker
482
-                elif docker ps | grep nova_api; then
483
-                  docker exec nova_api nova-manage db online_data_migrations
484
-                fi
485
-              tags: pre-upgrade
486
-              when: is_nova_api_bootstrap_node|bool
487 470
       external_upgrade_tasks:
488 471
         - when: step|int == 1
489 472
           block:

Loading…
Cancel
Save