diff options
| author | Sam Betts <sam@code-smash.net> | 2016-04-06 13:32:43 +0100 |
|---|---|---|
| committer | Sam Betts <sam@code-smash.net> | 2016-05-11 13:10:26 +0100 |
| commit | cdb80e0c909865cae8ed9d59166455fc354be36b (patch) | |
| tree | b87ee8b4a42f76a479652f3e11f9bb76f0c55f40 | |
| parent | 5c2d0ea7955f1c604bf4df46c05d98179646f9ed (diff) | |
| download | ironic-cdb80e0c909865cae8ed9d59166455fc354be36b.tar.gz | |
Enable download of tinyipa prebuilt image
Now there is a post job to build tinyipa and publish it to
tarballs.openstack.org, we can start to use it in the ironic devstack
script to prevent the need to build the image every time.
This change is cherry picked from 2 commits because the original change
had a follow up patch to fix a mistake in the tinyIPA file name.
Change-Id: I641a5afe8318ec0848395b2b70e056c448f3dd00
(cherry picked from commit c65af51e5b4a5ebd2824250e13ec95ca1aadfe42)
(cherry picked from commit b0c09844e19904bf6b8a5b78a47bdc8df0377d8e)
| -rw-r--r-- | devstack/lib/ironic | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index eb4fb1414..60cd6f916 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -108,8 +108,20 @@ IRONIC_DEPLOY_ELEMENT=${IRONIC_DEPLOY_ELEMENT:-deploy-ironic} # NOTE(jroll) this needs to be updated when stable branches are cut IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-stable/mitaka} IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -) -IRONIC_AGENT_KERNEL_URL=${IRONIC_AGENT_KERNEL_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe-${IPA_DOWNLOAD_BRANCH}.vmlinuz} -IRONIC_AGENT_RAMDISK_URL=${IRONIC_AGENT_RAMDISK_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem-${IPA_DOWNLOAD_BRANCH}.cpio.gz} + +case $IRONIC_RAMDISK_TYPE in + coreos) + IRONIC_AGENT_KERNEL_URL=${IRONIC_AGENT_KERNEL_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe-${IPA_DOWNLOAD_BRANCH}.vmlinuz} + IRONIC_AGENT_RAMDISK_URL=${IRONIC_AGENT_RAMDISK_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem-${IPA_DOWNLOAD_BRANCH}.cpio.gz} + ;; + tinyipa) + IRONIC_AGENT_KERNEL_URL=${IRONIC_AGENT_KERNEL_URL:-http://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-${IPA_DOWNLOAD_BRANCH}.vmlinuz} + IRONIC_AGENT_RAMDISK_URL=${IRONIC_AGENT_RAMDISK_URL:-http://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-${IPA_DOWNLOAD_BRANCH}.gz} + ;; + *) + die $LINENO "Unrecognised IRONIC_RAMDISK_TYPE: $IRONIC_RAMDISK_TYPE. Expected 'coreos' or 'tinyipa'" + ;; +esac # Which deploy driver to use - valid choices right now # are ``pxe_ssh``, ``pxe_ipmitool``, ``agent_ssh`` and ``agent_ipmitool``. |