openstack/devstack
Code Issues Proposed changes

Ironic: Set DEFAULT_IMAGE_NAME to full disk image for agent

Browse Source 
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
This commit is contained in:
Lucas Alvares Gomes
2016-03-03 10:33:17 +00:00
parent 925e2d9ded
commit f85a7e90f0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stackrc
View File

@@ -625,7 +625,7 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
ironic)
# Ironic can do both partition and full disk images, depending on the driver
if [[ "$IRONIC_DEPLOY_DRIVER" == "agent_ssh" ]]; then
if [[ -z "${IRONIC_DEPLOY_DRIVER%%agent*}" ]]; then
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
else
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}