Merge "Fixes clone fork change URL" into stable/euphrates
authorTim Rozet <trozet@redhat.com>
Sat, 23 Sep 2017 19:46:31 +0000 (19:46 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 23 Sep 2017 19:46:31 +0000 (19:46 +0000)
build/overcloud-full.sh
build/undercloud.sh

index 6fdc32d..06e461f 100755 (executable)
@@ -25,13 +25,13 @@ mv -f ${BUILD_DIR}/overcloud-full.qcow2 ${BUILD_DIR}/overcloud-full_build.qcow2
 pushd ${BUILD_DIR} > /dev/null
 
 # prep opnfv-puppet-tripleo for undercloud
-python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo
+python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo -b stable/euphrates
 pushd apex-puppet-tripleo > /dev/null
 git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/apex-puppet-tripleo.tar.gz
 popd > /dev/null
 
 # download customized os-net-config
-python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config
+python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config -b stable/euphrates
 pushd apex-os-net-config/os_net_config > /dev/null
 git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/apex-os-net-config.tar.gz
 popd > /dev/null
index 05cbf55..83ed21b 100755 (executable)
@@ -18,7 +18,7 @@ cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2
 pushd ${BUILD_DIR} > /dev/null
 
 # prep apex-tht for undercloud
-python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates
+python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates -b stable/euphrates
 pushd apex-tripleo-heat-templates > /dev/null
 git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz
 popd > /dev/null