diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-16 22:32:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-16 22:32:27 +0000 |
| commit | 74026c9b11abf02c618c563b8ce62ff1f130226e (patch) | |
| tree | c563216da9707b48a594c46ed0ccf8b9269b9756 | |
| parent | 13a5b4aa1b14ad5b8e2ac5d790fe13f7c78235fa (diff) | |
| parent | cdb80e0c909865cae8ed9d59166455fc354be36b (diff) | |
| download | ironic-74026c9b11abf02c618c563b8ce62ff1f130226e.tar.gz | |
Merge "Enable download of tinyipa prebuilt image" into stable/mitaka
| -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 894893f18..8325b6969 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``. |