openstack/tripleo-upgrade
Code Issues Proposed changes

Change docker references to podman.

Browse Source 
There are still some post upgrade validations which use docker
instead of podman. Changing them to the right containers engine.

Change-Id: I3560f67c59004652e38aaa006287460e283c9d07
This commit is contained in:
Jose Luis Franco Arza 2019-09-19 11:42:43 +02:00
parent cece0f85d4
commit 46372986ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/check_service_haproxy_backend.sh.j2
View File

@ -10,7 +10,7 @@ if [[ $EXT_LB != 'false' ]]; then
rm -rf ~/haproxy.stats rm -rf ~/haproxy.stats
echo "Waiting for haproxy backend services to come up" echo "Waiting for haproxy backend services to come up"
ssh -q -o StrictHostKeyChecking=no heat-admin@$NODE_IP > ~/haproxy.stats <<-\SSH ssh -q -o StrictHostKeyChecking=no heat-admin@$NODE_IP > ~/haproxy.stats <<-\SSH
sudo docker exec $(sudo docker ps | grep -oP haproxy-bundle.*) bash -c 'echo "show stat" | socat /var/lib/haproxy/stats stdio | grep -v redis' sudo podman exec $(sudo podman ps | grep -oP haproxy-bundle.*) bash -c 'echo "show stat" | socat /var/lib/haproxy/stats stdio | grep -v redis'
SSH SSH
grep DOWN ~/haproxy.stats > /dev/null grep DOWN ~/haproxy.stats > /dev/null
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then

2
templates/node_upgrade_post.sh.j2
View File

@ -33,7 +33,7 @@ timeout_seconds={{ node_reboot_timeout }}
elapsed_seconds=0 elapsed_seconds=0
while true; do while true; do
echo "Waiting for {{ node_name | splitext | first | splitext | first }} to boot ..." echo "Waiting for {{ node_name | splitext | first | splitext | first }} to boot ..."
NOVACOMPUTE_STATUS=$(ssh -q -o StrictHostKeyChecking=no heat-admin@$NODE_IP 'sudo docker inspect --format="{{ "{{" }} .State.Running {{ "}}" }}" nova_compute') NOVACOMPUTE_STATUS=$(ssh -q -o StrictHostKeyChecking=no heat-admin@$NODE_IP 'sudo podman inspect --format="{{ "{{" }} .State.Running {{ "}}" }}" nova_compute')
if [[ $NOVACOMPUTE_STATUS == 'true' ]]; then if [[ $NOVACOMPUTE_STATUS == 'true' ]]; then
break break
fi fi