openstack/ironic
Code Issues Proposed changes

Merge "DevStack: Make $IRONIC_IMAGE_NAME less dependent of the name in DevStack"

Browse Source
This commit is contained in:
Jenkins 2016-12-16 13:40:58 +00:00 committed by Gerrit Code Review
commit d2a02881a7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/lib/ironic
View File

@ -177,11 +177,14 @@ IRONIC_DEPLOY_ISO=${IRONIC_DEPLOY_ISO:-}
if [[ -z "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" && "$IRONIC_VM_EPHEMERAL_DISK" == 0 ]]; then
IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True
fi
IRONIC_TEMPEST_WHOLE_DISK_IMAGE=$(trueorfalse False IRONIC_TEMPEST_WHOLE_DISK_IMAGE)
if [[ "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" == "True" ]]; then
IRONIC_IMAGE_NAME=${IRONIC_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
else
IRONIC_IMAGE_NAME=${IRONIC_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
if [[ -z "$IRONIC_IMAGE_NAME" ]]; then
if [[ "$IRONIC_TEMPEST_WHOLE_DISK_IMAGE" == "True" ]]; then
IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME/-uec/-disk}
else
IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME/-disk/-uec}
fi
fi
# NOTE(jroll) this needs to be updated when stable branches are cut