Browse code

Merge "Ironic: Set DEFAULT_IMAGE_NAME to full disk image for agent"

Jenkins authored on 2016/03/11 00:04:16
Showing 1 changed files
... ...
@@ -625,7 +625,7 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
625 625
             IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
626 626
         ironic)
627 627
             # Ironic can do both partition and full disk images, depending on the driver
628
-            if [[ "$IRONIC_DEPLOY_DRIVER" == "agent_ssh" ]]; then
628
+            if [[ -z "${IRONIC_DEPLOY_DRIVER%%agent*}" ]]; then
629 629
                 DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
630 630
             else
631 631
                 DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}