From 796e1c6a907bdc45f9b49989ac3ead912e9e45fb Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 2 Oct 2014 10:58:33 +0200 Subject: [PATCH] Remove instructions to pull patch for x86_64 to create-nodes The needed patch has been merged, so we don't need to pull it in manually anymore. Instead we update LKG to include it. --- README-source.md | 2 -- instack-sourcerc | 2 +- scripts/instack-install-undercloud-source | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/README-source.md b/README-source.md index 3ad92ca3b..687d2d9a0 100644 --- a/README-source.md +++ b/README-source.md @@ -20,8 +20,6 @@ instack-undercloud via source cd instack git clone https://github.com/agroup/instack-undercloud git clone https://git.openstack.org/openstack/tripleo-incubator - # Pull down a needed patch for x86_64 support since discovered nodes are registered as x86_64 in Ironic. - pushd tripleo-incubator && git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/03/123803/2 && git cherry-pick FETCH_HEAD && popd 1. Complete the initial setup. diff --git a/instack-sourcerc b/instack-sourcerc index dd61178d9..e387ac0f8 100644 --- a/instack-sourcerc +++ b/instack-sourcerc @@ -47,7 +47,7 @@ if [ "$LKG" = "1" ]; then export DIB_REPOREF_tripleo_image_elements=5fea32ff79220fce2eb808d9b119832a98ace626 export DIB_REPOREF_diskimage_builder=dbc60e8942ca700cd673a115a6d327af8ee41483 export DIB_REPOREF_os_cloud_config=4a03e6b129c91a7269b6103a1f85fd011ec92c91 - export DIB_REPOREF_tripleo_incubator=b51d5a1840b4e985b7daa334814a10590af00d53 + export DIB_REPOREF_tripleo_incubator=c3fb309727671130a32b4c19de48ec22c8530aa1 # This is set manually since swift is not part of the undercloud export DIB_REPOREF_swift=4dc718e8c3bd2a8bbe1f2d7a98ad03421a70217f diff --git a/scripts/instack-install-undercloud-source b/scripts/instack-install-undercloud-source index f18432a8e..233fcc194 100755 --- a/scripts/instack-install-undercloud-source +++ b/scripts/instack-install-undercloud-source @@ -93,12 +93,6 @@ if [ ! -d $INSTACK_ROOT/tripleo-incubator ]; then git reset --hard FETCH_HEAD fi - - ## create-nodes x86_64 support - # - # https://review.openstack.org/#/c/123803/ - git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/03/123803/2 && git cherry-pick FETCH_HEAD - popd fi