openstack/ironic
Code Issues Proposed changes

Merge "Adding file uri support for ipa image location"

Browse Source
This commit is contained in:
Zuul 2019-08-29 01:14:45 +00:00 committed by Gerrit Code Review
commit 3c9f2a834e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/lib/ironic
View File

@ -2619,9 +2619,17 @@ function upload_baremetal_ironic_deploy {
die $LINENO "Deploy kernel+ramdisk or iso files don't exist and cannot be built in OFFLINE mode" die $LINENO "Deploy kernel+ramdisk or iso files don't exist and cannot be built in OFFLINE mode"
fi fi
else else
# download the agent image tarball # Grab the agent image tarball, either from a local file or remote URL
wget "$IRONIC_AGENT_KERNEL_URL" -O $IRONIC_DEPLOY_KERNEL if [[ "$IRONIC_AGENT_KERNEL_URL" =~ "file://" ]]; then
wget "$IRONIC_AGENT_RAMDISK_URL" -O $IRONIC_DEPLOY_RAMDISK cp ${IRONIC_AGENT_KERNEL_URL:7} $IRONIC_DEPLOY_KERNEL
else
wget "$IRONIC_AGENT_KERNEL_URL" -O $IRONIC_DEPLOY_KERNEL
fi
if [[ "$IRONIC_AGENT_RAMDISK_URL" =~ "file://" ]]; then
cp ${IRONIC_AGENT_RAMDISK_URL:7} $IRONIC_DEPLOY_RAMDISK
else
wget "$IRONIC_AGENT_RAMDISK_URL" -O $IRONIC_DEPLOY_RAMDISK
fi
if is_ansible_with_tinyipa; then if is_ansible_with_tinyipa; then
# NOTE(pas-ha) if using ansible-deploy and tinyipa, # NOTE(pas-ha) if using ansible-deploy and tinyipa,
# this will rebuild ramdisk and override $IRONIC_DEPLOY_RAMDISK # this will rebuild ramdisk and override $IRONIC_DEPLOY_RAMDISK