Update Cirros to O.5.1

It conforms to the OpenStack gates which have just updated to Cirros
0.5.1

Change-Id: If2ec4b2da2152c244af7ea86a57054fea195c4ce
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

9 files changed, 127 insertions, 127 deletions

diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 75af1bb52..d63ddeeb9 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -55,8 +55,8 @@ Create a directory for the different images (attached as a Docker volume)::
 
   mkdir -p images && wget -q -O- https://git.opnfv.org/functest/plain/functest/ci/download_images.sh | bash -s -- images && ls -1 images/*
 
-  images/cirros-0.4.0-aarch64-disk.img
-  images/cirros-0.4.0-x86_64-disk.img
+  images/cirros-0.5.1-aarch64-disk.img
+  images/cirros-0.5.1-x86_64-disk.img
   images/cloudify-docker-manager-community-19.01.24.tar
   images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2
   images/shaker-image-1.3.0+stretch.qcow2
@@ -628,5 +628,5 @@ work with the above pre-requisite actions.
 .. _`Install Docker on CentOS`: https://docs.docker.com/engine/installation/linux/centos/
 .. _`Functest User Guide`: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/user/userguide/index.html
 .. _`images/CentOS-7-x86_64-GenericCloud.qcow2`: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
-.. _`images/cirros-0.4.0-x86_64-disk.img`: http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+.. _`images/cirros-0.5.1-x86_64-disk.img`: http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
 .. _`images/ubuntu-14.04-server-cloudimg-amd64-disk1.img`: https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
diff --git a/docs/testing/user/userguide/troubleshooting.rst b/docs/testing/user/userguide/troubleshooting.rst
index b13853c48..663051f97 100644
--- a/docs/testing/user/userguide/troubleshooting.rst
+++ b/docs/testing/user/userguide/troubleshooting.rst
@@ -102,7 +102,7 @@ In this case, proceed to create it manually. These are some hints::
     --protocol tcp --port-range-min 80 --port-range-max 80 --remote-ip-prefix 0.0.0.0/0
 
 The next step is to create the instances. The image used is located in
-*/home/opnfv/functest/data/cirros-0.4.0-x86_64-disk.img* and a Glance image is
+*/home/opnfv/functest/data/cirros-0.5.1-x86_64-disk.img* and a Glance image is
 created with the name **functest-vping**. If booting the instances fails (i.e.
 the status is not **ACTIVE**), you can check why it failed by doing::
 
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 12803a69a..278265620 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -1,99 +1,99 @@
 ---
 os:
     vmready1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     vmready2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     singlevm1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     singlevm2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     vping_ssh:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     vping_userdata:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     cinder_test:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_smoke:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_horizon:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_neutron:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_cinder:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_keystone:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_heat:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2
     tempest_telemetry:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_sanity:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     refstack_compute:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     refstack_object:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     refstack_platform:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_full:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_scenario:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_slow:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     patrole:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_barbican:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_octavia:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_neutron_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_cinder_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_keystone_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_heat_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2
     rally_sanity_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_scenario_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     tempest_slow_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_full:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_jobs:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
     rally_jobs_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image: /home/opnfv/functest/images/cirros-0.5.1-aarch64-disk.img
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index d7a162f73..647301ab4 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -18,10 +18,10 @@ general:
         rally_inst: /root/.rally
 
     openstack:
-        image_name: Cirros-0.4.0
-        image_name_alt: Cirros-0.4.0-1
-        image_file_name: cirros-0.4.0-x86_64-disk.img
-        image_url: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
+        image_name: Cirros-0.5.1
+        image_name_alt: Cirros-0.5.1-1
+        image_file_name: cirros-0.5.1-x86_64-disk.img
+        image_url: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.img
         image_user: cirros
         image_disk_format: qcow2
         image_username: cirros
diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 8dc4f0e8a..d5335c3ab 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -312,154 +312,154 @@ ovs:
 
 vio:
     vmready1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vmready2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm1:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     singlevm2:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_ssh:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vping_userdata:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     cinder_test:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     tempest_smoke:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_horizon:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_neutron:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_cinder:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_keystone:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_heat:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
         image_alt_format: vmdk
     tempest_telemetry:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     rally_sanity:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     refstack_compute:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     refstack_object:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     refstack_platform:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_full:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_scenario:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_slow:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     patrole:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_barbican:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_octavia:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_neutron_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_cinder_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_keystone_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_heat_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
         image_alt_format: vmdk
     rally_sanity_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     tempest_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_scenario_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     tempest_slow_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
-        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_alt_format: vmdk
     rally_full:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     rally_jobs:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     vmtp:
         image:
@@ -469,10 +469,10 @@ vio:
         image: /home/opnfv/functest/images/shaker-image.vmdk
         image_format: vmdk
     rally_full_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     rally_jobs_cntt:
-        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image: /home/opnfv/functest/images/cirros-0.5.1-x86_64-disk.vmdk
         image_format: vmdk
     cloudify:
         image:
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 5855f97f6..358ccf916 100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -6,10 +6,10 @@ wget_opts="-N --tries=1 --connect-timeout=30"
 [ -t 1 ] || wget_opts="${wget_opts} --progress=dot:giga"
 
 cat << EOF  | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images}
-http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
 https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
-http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
+http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-aarch64-disk.img
 http://repository.cloudifysource.org/cloudify/19.01.24/community-release/cloudify-docker-manager-community-19.01.24.tar
 http://testresults.opnfv.org/functest/vyos-1.1.8-amd64.qcow2
 http://testresults.opnfv.org/functest/shaker-image-1.3.4+stretch.qcow2
diff --git a/functest/ci/rally_aarch64_patch.conf b/functest/ci/rally_aarch64_patch.conf
index baeceac76..4ea0d7605 100644
--- a/functest/ci/rally_aarch64_patch.conf
+++ b/functest/ci/rally_aarch64_patch.conf
@@ -1,5 +1,5 @@
 img_name_regex = ^TestVM$
-img_url = http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
+img_url = http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-aarch64-disk.img
 flavor_ref_ram = 256
 flavor_ref_alt_ram = 256
 heat_instance_type_ram = 256
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
index 35b107838..f1a12c178 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
+++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
@@ -7,7 +7,7 @@ parameters:
     default: public
   image:
     type: string
-    default: cirros-0.4.0-x86_64-uec
+    default: cirros-0.5.1-x86_64-uec
   flavor:
     type: string
     default: m1.tiny
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
index 5c9a86b79..9a0f1aa72 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
+++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
@@ -4,7 +4,7 @@ parameters:
   # set all correct defaults for parameters before launch test
   image:
     type: string
-    default: cirros-0.4.0-x86_64-uec
+    default: cirros-0.5.1-x86_64-uec
   flavor:
     type: string
     default: m1.tiny