From 459f63439beb81a33e5e65d0c54c61832186f42e Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Tue, 28 Sep 2021 10:51:51 +0200 Subject: [PATCH] Replace cirros 0.4.0 by 0.5.2 in ovn migration create-resources.sh.j2 Some VMs are created before the ovn mgiration process starts in order to verify they are healthy after the migration Sometimes these VMs are not accessible via ssh due to an issue in cirros 0.4.0 that was fixed in a later release [1] Closes-Bug: #1945299 [1] https://github.com/cirros-dev/cirros/pull/11 Change-Id: Ib133b5e1bed19aeac8514e3c6690ca768991bbd4 --- .../roles/create-resources/templates/create-resources.sh.j2 | 6 +++--- .../roles/resources/create/templates/create-resources.sh.j2 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/create-resources/templates/create-resources.sh.j2 b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/create-resources/templates/create-resources.sh.j2 index 1cc095d3e2d..752b6f1406b 100644 --- a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/create-resources/templates/create-resources.sh.j2 +++ b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/create-resources/templates/create-resources.sh.j2 @@ -8,12 +8,12 @@ image_name={{ image_name }} openstack image show $image_name if [ "$?" != "0" ] then - if [ ! -f cirros-0.4.0-x86_64-disk.img ] + if [ ! -f cirros-0.5.2-x86_64-disk.img ] then - curl -Lo cirros-0.4.0-x86_64-disk.img https://github.com/cirros-dev/cirros/releases/download/0.4.0/cirros-0.4.0-x86_64-disk.img + curl -Lo cirros-0.5.2-x86_64-disk.img https://github.com/cirros-dev/cirros/releases/download/0.5.2/cirros-0.5.2-x86_64-disk.img fi - openstack image create "cirros-ovn-migration-{{ resource_suffix }}" --file cirros-0.4.0-x86_64-disk.img \ + openstack image create "cirros-ovn-migration-{{ resource_suffix }}" --file cirros-0.5.2-x86_64-disk.img \ --disk-format qcow2 --container-format bare --public image_name="cirros-ovn-migration-{{ resource_suffix }}" fi diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/resources/create/templates/create-resources.sh.j2 b/tools/ovn_migration/tripleo_environment/playbooks/roles/resources/create/templates/create-resources.sh.j2 index c9672974e4e..ebb12d1c996 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/resources/create/templates/create-resources.sh.j2 +++ b/tools/ovn_migration/tripleo_environment/playbooks/roles/resources/create/templates/create-resources.sh.j2 @@ -8,12 +8,12 @@ image_name={{ image_name }} openstack image show $image_name if [ "$?" != "0" ] then - if [ ! -f cirros-0.4.0-x86_64-disk.img ] + if [ ! -f cirros-0.5.2-x86_64-disk.img ] then - curl -Lo cirros-0.4.0-x86_64-disk.img https://github.com/cirros-dev/cirros/releases/download/0.4.0/cirros-0.4.0-x86_64-disk.img + curl -Lo cirros-0.5.2-x86_64-disk.img https://github.com/cirros-dev/cirros/releases/download/0.5.2/cirros-0.5.2-x86_64-disk.img fi - openstack image create "cirros-ovn-migration-{{ resource_suffix }}" --file cirros-0.4.0-x86_64-disk.img \ + openstack image create "cirros-ovn-migration-{{ resource_suffix }}" --file cirros-0.5.2-x86_64-disk.img \ --disk-format qcow2 --container-format bare --public image_name="cirros-ovn-migration-{{ resource_suffix }}" fi