summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorRiccardo Pittau <elfosardo@gmail.com>2021-04-14 10:26:57 +0200
committerAija Jauntēva <aija.jaunteva@dell.com>2021-04-19 13:47:10 -0400
commitdf368cbd8a2f4975a5efea355e8cd9ba101c0cb9 (patch)
treee8873166a8b731f81b719cc1047ea2fd5616abad /devstack
parentb4d8a493d9fdb693e64f3d0b11245523c2510665 (diff)
downloadironic-df368cbd8a2f4975a5efea355e8cd9ba101c0cb9.tar.gz
Read default cirros version from stackrc
Workaround for grenade jobs to read CIRROS_VERSION variable from stackrc. We also give the possibility to specify a custom CIRROS_VERSION In addition, fix transient iDRAC WS-Man BIOS test. Depends-On: https://review.opendev.org/c/openstack/ironic/+/786387 Change-Id: Ic7f5dae5e6aa6916f0a7d73f43cc9552349385c5
Diffstat (limited to 'devstack')
-rw-r--r--devstack/common_settings7
1 files changed, 6 insertions, 1 deletions
diff --git a/devstack/common_settings b/devstack/common_settings
index 59d12eb52..d649f70a5 100644
--- a/devstack/common_settings
+++ b/devstack/common_settings
@@ -7,7 +7,12 @@ 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}
-CIRROS_VERSION=${CIRROS_VERSION:-"0.5.1"}
+
+CIRROS_VERSION_DEVSTACK=$(set +o xtrace &&
+ source $TOP_DIR/stackrc &&
+ echo $CIRROS_VERSION)
+
+CIRROS_VERSION=${CIRROS_VERSION:-$CIRROS_VERSION_DEVSTACK}
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec