From 81938c8e73a240e0773c812725de4e802f213b53 Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Fri, 25 Jan 2019 19:25:10 +0530
Subject: [PATCH] Update cirros from 3.5 to 3.6

Current 3.5 cirros image is giving sh: write error: No space left
on device error leading to tempest scenario tests failures as
config-drive setup fails. It fixes the same.

Related-Bug: #1808010

Change-Id: I8a6230a8d8bac7cfbd3c11a3a3b508878e5e1741
---
 defaults/main.yml           | 8 ++++----
 tasks/tempest_resources.yml | 1 +
 vars/redhat-7.yml           | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 682e06a9..690b98b0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -240,12 +240,12 @@ tempest_pip_packages:
 # format: format to use when uploading to glance (required)
 # name: name to use when uploading to glance - default is to use the downloaded file's name (optional)
 tempest_images:
-  - url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
-    checksum: "sha256:e137062a4dfbb4c225971b67781bc52183d14517170e16a3841d16f962ae7470"
+  - url: "http://download.cirros-cloud.net/0.3.6/cirros-0.3.6-x86_64-disk.img"
+    checksum: "sha256:72d301384d45cf396c82fd767ff4bf948c94335bbbee46b94946e85c422fa1bd"
     format: "qcow2"
     name: "cirros"
-  - url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
-    checksum: "sha256:e137062a4dfbb4c225971b67781bc52183d14517170e16a3841d16f962ae7470"
+  - url: "http://download.cirros-cloud.net/0.3.6/cirros-0.3.6-x86_64-disk.img"
+    checksum: "sha256:72d301384d45cf396c82fd767ff4bf948c94335bbbee46b94946e85c422fa1bd"
     format: "qcow2"
     name: "cirros"
 
diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml
index 2639f4c5..a653345f 100644
--- a/tasks/tempest_resources.yml
+++ b/tasks/tempest_resources.yml
@@ -194,6 +194,7 @@
         name: "{{ tempest_private_subnet_name }}"
         cidr: "{{ tempest_private_subnet_cidr }}"
         project: "{{ keystone_demo_tenant_id }}"
+        enable_dhcp: false
       register: _add_private_subnet
       until: _add_private_subnet is success
       retries: 5
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 29c92f2e..b8062ebd 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -18,7 +18,6 @@ tempest_distro_packages:
   - git
   - libxslt              # required by the python module unittest2
   - gcc                  # required to build tempest plugins (TODO) remove this when the repo server can satisfy the tempest plugin requirements
-  - libselinux-python
 
 tempest_service_distro_packages:
   - openstack-tempest