From 82f1e0c928ded50c343d26aa463bf0145e948a4c Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 27 May 2020 10:49:47 +0200
Subject: [PATCH] CI: use the default devstack cirros version

Now that I6ccd646f1c22a99bed0bebf6e363d2190241b667 is merged, devstack
defaults to 0.5.1, and we no longer need our special logic.

Change-Id: I13d3a4ab7dc330b22d886d85eae94b296e6cac4a
---
 devstack/common_settings | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/devstack/common_settings b/devstack/common_settings
index 6fc49a52c6..59d12eb525 100644
--- a/devstack/common_settings
+++ b/devstack/common_settings
@@ -7,13 +7,7 @@ fi
 # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
 # values are: "bios" or "uefi", defaults to "bios".
 IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios}
-
-# TODO(dtantsur): migrate all jobs to 0.5.1
-if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
-    CIRROS_VERSION=0.5.1
-else
-    CIRROS_VERSION=0.4.0
-fi
+CIRROS_VERSION=${CIRROS_VERSION:-"0.5.1"}
 
 IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec