From bd4eb947989d40f3e99b1a976845cb39fa707886 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 8 Oct 2014 15:48:39 -0400 Subject: [PATCH] Add cherry-pick from github for tripleo-image-elements to pick up the RDO specific swift default ports patch --- scripts/instack-install-undercloud-source | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/instack-install-undercloud-source b/scripts/instack-install-undercloud-source index 02c114b7a..3f765e608 100755 --- a/scripts/instack-install-undercloud-source +++ b/scripts/instack-install-undercloud-source @@ -42,6 +42,11 @@ function do_tripleo_source_installs { fi + # This patch is RDO specific, as such there is no upstream review for it. + # Change default swift ports + git fetch https://github.com/redhat-openstack/tripleo-image-elements + git cherry-pick d540b460083251231465fee4a158e6848767b33f + # https://review.openstack.org/#/c/125354 git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/54/125354/4 && git cherry-pick FETCH_HEAD