openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-08-30 17:35:00 +00:00 committed by Gerrit Code Review
parent c0776ea25c c992964f10
commit bd4c2fa3f7
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,23 +353,6 @@ outputs:
Log files from cinder containers can be found under
/var/log/containers/cinder and /var/log/containers/httpd/cinder-api.
ignore_errors: true
upgrade_tasks:
- when: step|int == 0
tags: common
block:
- name: set is_cinder_api_bootstrap_node fact
set_fact: is_cinder_api_bootstrap_node={{cinder_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Ensure all online data migrations for Cinder have been applied
shell: |
if {{ container_cli }} ps | grep cinder_api; then
{{ container_cli }} exec cinder_api cinder-manage db online_data_migrations
# handle situation when container_cli is podman but
# the containers are still under docker
elif docker ps | grep cinder_api; then
docker exec cinder_api cinder-manage db online_data_migrations
fi
tags: pre-upgrade
when: is_cinder_api_bootstrap_node|bool
post_upgrade_tasks:
- when: step|int == 1
import_role:

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

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

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

@ -467,23 +467,6 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
host_prep_tasks: {get_attr: [NovaApiLogging, host_prep_tasks]}
upgrade_tasks:
- when: step|int == 0
tags: common
block:
- name: set is_nova_api_bootstrap_node fact
set_fact: is_nova_api_bootstrap_node={{nova_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Ensure all online data migrations for Nova have been applied
shell: |
if {{ container_cli }} ps | grep nova_api; then
{{ container_cli }} exec nova_api nova-manage db online_data_migrations
# handle situation when container_cli is podman but
# the containers are still under docker
elif docker ps | grep nova_api; then
docker exec nova_api nova-manage db online_data_migrations
fi
tags: pre-upgrade
when: is_nova_api_bootstrap_node|bool
external_upgrade_tasks:
- when: step|int == 1
block: