From a83b5385e87afea1d6e0a901db51cb5fdb18243f Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 31 Mar 2016 08:59:24 -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 patch uses stable/liberty as the default, and is an indirect backport of ironic commit 8e15d6a1388f49026c4d35ba87219a49ccc3c134, as ironic moved to a devstack plugin in Mitaka. Change-Id: I045f1a8d674acae9f45bdde8692d4ecc19b328c8 Depends-On: I3ec6dafb9522b5fe79e0c6681c2578d2a723380a Closes-Bug: #1561756 --- lib/ironic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/ironic b/lib/ironic index 2bd4062b8f..2228ebcfed 100644 --- a/lib/ironic +++ b/lib/ironic @@ -96,8 +96,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/liberty} +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``.