Merge "Make refresh-env more resilient for users"

This commit is contained in:
Jenkins
2013-12-16 09:28:24 +00:00
committed by Gerrit Code Review

View File

@@ -13,20 +13,31 @@
# License for the specific language governing permissions and limitations
# under the License.
__tripleo_refresh_env() {
export TRIPLEO_ROOT=$1
export PATH=$TRIPLEO_ROOT/tripleo-incubator/scripts:$PATH
source $(dirname $BASH_SOURCE)/set-os-type
export NODE_DIST=${NODE_DIST:-"$TRIPLEO_OS_DISTRO"}
export NODE_ARCH=${NODE_ARCH:-i386}
pull-tools
setup-clienttools
export ELEMENTS_PATH=$TRIPLEO_ROOT/tripleo-image-elements/elements
echo "Make sure to source your stackrc file"
}
# Setup/update your undercloud environment to run devtest_overcloud.sh
# Usage:
# source refresh-env TRIPLEO_ROOT
# Ex:
# source refresh-env ~/tripleo
export TRIPLEO_ROOT=$1
export PATH=$TRIPLEO_ROOT/tripleo-incubator/scripts:$PATH
source set-os-type
export NODE_DIST=${NODE_DIST:-"$TRIPLEO_OS_DISTRO"}
export NODE_ARCH=${NODE_ARCH:-i386}
pull-tools
setup-clienttools
export ELEMENTS_PATH=$TRIPLEO_ROOT/tripleo-image-elements/elements
echo "Make sure to source your stackrc file"
#
if [ -z "${1:-}" ] ; then
echo "Usage:"
echo "source refresh-env TRIPLEO_ROOT"
echo "Ex:"
echo "source refresh-env ~/tripleo"
else
if [ -d "$1/tripleo-incubator/scripts" ] ; then
__tripleo_refresh_env $1
else
echo "TRIPLEO_ROOT must contain tripleo-incubator/scripts"
fi
fi