1. devstack
  2. Commit f85a7e90f02ca691545cba2d2ce03aef671c9f15
Browse code

Ironic: Set DEFAULT_IMAGE_NAME to full disk image for agent

The agent_* drivers in Ironic are not yet capable of deploying partition
images. The code in DevStack was aware of that but it was looking at the
agent_ssh driver specifically.

This patch is fixing this assumption and extending that conditional for
all agent drivers.

Change-Id: I416faa9ef6fba9621cd664d5a0747b1e80e281d1

Lucas Alvares Gomes authored on 2016/03/03 19:33:17
Showing 1 changed files
stackrc
History View file @ f85a7e9
... ... 
@@ -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}