diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-30 16:09:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-30 16:09:15 +0000 |
| commit | 3f54fec070fdc0e7a63083eb0630b1d37005c30c (patch) | |
| tree | 16ee4b37a3fb4cdd42ca5b50a2e0d40f26dcb59a | |
| parent | 6df225f736e293bcfd4d1ecbc4415e698bcf5fde (diff) | |
| parent | 7b0c2777ab333340cef5ced9fc3d141fc67e961d (diff) | |
| download | ironic-3f54fec070fdc0e7a63083eb0630b1d37005c30c.tar.gz | |
Merge "Change the logic of selecting image for tests" into stable/newton6.2.1
| -rw-r--r-- | devstack/lib/ironic | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 4069399a5..ec30c3e2e 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -151,6 +151,18 @@ IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-} IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-} IRONIC_DEPLOY_ISO=${IRONIC_DEPLOY_ISO:-} +# These parameters describe which image will be used to provision a node in +# tempest tests +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} +fi + # NOTE(jroll) this needs to be updated when stable branches are cut IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-stable/newton} IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -) @@ -1495,6 +1507,11 @@ function ironic_configure_tempest { if [[ -n "${IRONIC_PROVISION_NETWORK_NAME}" ]]; then iniset $TEMPEST_CONFIG baremetal use_provision_network True fi + + local image_uuid + image_uuid=$(openstack image show $IRONIC_IMAGE_NAME -f value -c id) + iniset $TEMPEST_CONFIG compute image_ref $image_uuid + iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid } # Restore xtrace + pipefail |