From 90671b2e0b05ea908a375c5bdb271afb55014870 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Tue, 2 Mar 2021 11:53:20 +0100
Subject: [PATCH] Update the cirros version to 0.5.1

We are hitting random timeout issues when intances trying to get
metadata. This version includes a fix for this [1].

[1] https://github.com/cirros-dev/cirros/pull/11/commits/e40bcd2964aa496a9d03e1aaf95cf7a86938f129

Change-Id: I7ee221be2a01b0e8b22b51902a81fe29bb624db3
---
 manifests/provision.pp | 4 ++--
 manifests/tempest.pp   | 2 +-
 run_tests.sh           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/provision.pp b/manifests/provision.pp
index 96a0fd990..41c088998 100644
--- a/manifests/provision.pp
+++ b/manifests/provision.pp
@@ -84,14 +84,14 @@ class openstack_integration::provision (
       container_format => 'bare',
       disk_format      => 'qcow2',
       is_public        => 'yes',
-      source           => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
+      source           => '/tmp/openstack/image/cirros-0.5.1-x86_64-disk.img'
     }
     glance_image { 'cirros_alt':
       ensure           => present,
       container_format => 'bare',
       disk_format      => 'qcow2',
       is_public        => 'yes',
-      source           => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
+      source           => '/tmp/openstack/image/cirros-0.5.1-x86_64-disk.img'
     }
     Keystone_user_role['admin@openstack'] -> Glance_image<||>
   }
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 189f6ca97..ce4f95534 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -259,7 +259,7 @@ class openstack_integration::tempest (
     image_alt_ssh_user               => 'cirros',
     # TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
     # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
-    img_file                         => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img',
+    img_file                         => '/tmp/openstack/image/cirros-0.5.1-x86_64-disk.img',
     compute_build_interval           => 10,
     ca_certificates_file             => $::openstack_integration::params::ca_bundle_cert_path,
     manage_tests_packages            => true,
diff --git a/run_tests.sh b/run_tests.sh
index cc2df8383..6a8ca59ab 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -135,13 +135,13 @@ if [[ ! -e $IMG_DIR ]]; then
     mkdir -p $IMG_DIR
 fi
 
-if [ -f ~/cache/files/cirros-0.4.0-x86_64-disk.img ]; then
+if [ -f ~/cache/files/cirros-0.5.1-x86_64-disk.img ]; then
     # Create a symlink for tempest.
-    if ! [ -h /tmp/openstack/image/cirros-0.4.0-x86_64-disk.img ] ; then
-        ln -s ~/cache/files/cirros-0.4.0-x86_64-disk.img $IMG_DIR
+    if ! [ -h /tmp/openstack/image/cirros-0.5.1-x86_64-disk.img ] ; then
+        ln -s ~/cache/files/cirros-0.5.1-x86_64-disk.img $IMG_DIR
     fi
 else
-    wget http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P $IMG_DIR
+    wget http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img -P $IMG_DIR
 fi
 
 install_puppet