openstack/ironic
Code Issues Proposed changes

CI: use the default devstack cirros version

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

Change-Id: I13d3a4ab7dc330b22d886d85eae94b296e6cac4a
This commit is contained in:
Dmitry Tantsur 2020-05-27 10:49:47 +02:00
parent fa3c224022
commit 82f1e0c928
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/common_settings
View File

@ -7,13 +7,7 @@ fi
# Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
# values are: "bios" or "uefi", defaults to "bios". # values are: "bios" or "uefi", defaults to "bios".
IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios} IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios}
CIRROS_VERSION=${CIRROS_VERSION:-"0.5.1"}
# 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
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec