openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "[FFWD] Propose a fix for node_upgrade_pre.sh.j2"

This commit is contained in:
Zuul 2021-01-07 00:22:44 +00:00 committed by Gerrit Code Review
parent 92aac2f3a0 b8d3218d1e
commit 87be79e1c8
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/fast-forward-upgrade/create-overcloud-ffu-hosts-scripts.yaml
View File

@ -4,9 +4,7 @@
when: pcs_present when: pcs_present
- name: create compute pre upgrade script for {{ item }} - name: create compute pre upgrade script for {{ item }}
when: when: (compute_present | bool) or (workload_launch | bool)
- compute_present|bool
- workload_launch|bool
vars: vars:
node_name: "{{ item | reject('none') | join(',') }}" node_name: "{{ item | reject('none') | join(',') }}"
template: template:

4
tasks/fast-forward-upgrade/overcloud_upgrade_hosts.yaml
View File

@ -21,9 +21,7 @@
openstack compute service set --disable --disable-reason FFWD "$HOST" nova-compute openstack compute service set --disable --disable-reason FFWD "$HOST" nova-compute
- name: run the pre upgrade script for the host {{ host }} - name: run the pre upgrade script for the host {{ host }}
when: when: (compute_present | bool) or (workload_launch | bool)
- compute_present|bool
- workload_launch|bool
shell: | shell: |
set -o pipefail set -o pipefail
./{{ host }}_upgrade_pre.sh 2>&1 {{ timestamper_cmd }} >> {{ host }}_upgrade_pre.log ./{{ host }}_upgrade_pre.sh 2>&1 {{ timestamper_cmd }} >> {{ host }}_upgrade_pre.log

12
templates/node_upgrade_pre.sh.j2
View File

@ -2,14 +2,20 @@
source {{ overcloud_rc }} source {{ overcloud_rc }}
## Get exact hostname ## Get exact hostname
HOST=$(openstack compute service list -f value -c Host | grep {{ node_name }} ) HOST=$(openstack compute service list -f value -c Host | grep {{ node_name }} )
nova host-evacuate-live ${HOST} INSTANCE_COUNT=$(openstack server list --all --host ${HOST} -f json | jq -r -c '[.[] | select(.Status | contains("ACTIVE"))] | length')
if [ $INSTANCE_COUNT != 0 ]; then
nova host-evacuate-live ${HOST}
else
echo "No vms in active state on ${HOST}"
fi
INSTANCE_COUNT=$(openstack server list --host ${HOST} -f json | jq -r -c '[.[] | select(.Status | contains("ACTIVE") or contains("PAUSED") or contains("MIGRATING"))] | length') INSTANCE_COUNT=$(openstack server list --host ${HOST} -f json | jq -r -c '[.[] | select(.Status | contains("ACTIVE") or contains("PAUSED") or contains("MIGRATING"))] | length')
timeout_seconds=$(( 60 * ( $INSTANCE_COUNT + 1 ) )) timeout_seconds=$(( 60 * ( $INSTANCE_COUNT + 1 ) ))
elapsed_seconds=0 elapsed_seconds=0
while true; do while [ $INSTANCE_COUNT != 0 ]; do
echo "Waiting for ${HOST} to get quiesced ..." echo "Waiting for ${HOST} to get quiesced ..."
INSTANCE_COUNT=$(openstack server list --host ${HOST} -f json | jq -r -c '[.[] | select(.Status | contains("ACTIVE") or contains("PAUSED") or contains("MIGRATING"))] | length') INSTANCE_COUNT=$(openstack server list --all --host ${HOST} -f json | jq -r -c '[.[] | select(.Status | contains("ACTIVE") or contains("PAUSED") or contains("MIGRATING"))] | length')
if [ $INSTANCE_COUNT == 0 ]; then if [ $INSTANCE_COUNT == 0 ]; then
break break
fi fi