From 6510b8f86b10e92e2462fd4796bd6ec7ad710c4b Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 24 Mar 2016 17:45:15 -0700 Subject: [PATCH] Allow fetching IPA ramdisk with branch name This adds branch name to the default URLs for IPA images, ensuring that devstack runs will use the correct branch of IPA for tests. It introduces a variable IPA_DOWNLOAD_BRANCH to accomplish this, which defaults to master. This default will be set to the branch name on stable branches, e.g. stable/mitaka. It is modified to match our URL scheme for agent images, e.g. stable-mitaka. This cherry-pick is modified to set the default to stable/mitaka. Change-Id: I3ec6dafb9522b5fe79e0c6681c2578d2a723380a Closes-Bug: #1561756 (cherry picked from commit 8e15d6a1388f49026c4d35ba87219a49ccc3c134) --- devstack/lib/ironic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 5abcdfb91a..eb4fb1414e 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -105,8 +105,11 @@ IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-} IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-} IRONIC_DEPLOY_ELEMENT=${IRONIC_DEPLOY_ELEMENT:-deploy-ironic} -IRONIC_AGENT_KERNEL_URL=${IRONIC_AGENT_KERNEL_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe.vmlinuz} -IRONIC_AGENT_RAMDISK_URL=${IRONIC_AGENT_RAMDISK_URL:-http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem.cpio.gz} +# 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} # Which deploy driver to use - valid choices right now # are ``pxe_ssh``, ``pxe_ipmitool``, ``agent_ssh`` and ``agent_ipmitool``.