openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "fix for quickstart.sh requirements"

This commit is contained in:
Jenkins 2016-12-22 19:52:57 +00:00 committed by Gerrit Code Review
parent e0493a24df 7528970a78
commit b6dbf6a084
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci-scripts/get-node.sh
View File

@ -10,6 +10,7 @@ pushd $WORKSPACE/tripleo-quickstart
--working-dir $WORKSPACE/ \
--no-clone \
--bootstrap \
--requirements requirements.txt \
--requirements ci-scripts/ci-base-requirements.txt \
--playbook noop.yml \
localhost

10
quickstart.sh
View File

@ -17,7 +17,6 @@ DEFAULT_OPT_TAGS="untagged,provision,environment,undercloud-scripts,overcloud-sc
: ${OPT_TEARDOWN:=nodes}
: ${OPT_WORKDIR:=$HOME/.quickstart}
clean_virtualenv() {
if [ -d $OPT_WORKDIR ]; then
echo "WARNING: Removing $OPT_WORKDIR. Triggering virtualenv bootstrap."
@ -161,7 +160,9 @@ usage () {
echo " (default=$OPT_PLAYBOOK)"
echo " -r, --requirements <file>"
echo " install requirements with pip, can be used"
echo " multiple times (default=$OOOQ_BASE_REQUIREMENTS)"
echo " multiple times. By using this flag you override "
echo " both requirements.txt and quickstart-extras-requirements.txt."
echo " The user assumes responsibility for the requirements. "
echo " -R, --release OpenStack release to deploy (default=$OPT_RELEASE)"
echo " -c, --config <file>"
echo " specify the config file that contains the node"
@ -207,7 +208,6 @@ usage () {
}
OPT_REQARGS=("-r" "$OOOQ_BASE_REQUIREMENTS" "-r" "$OOOQ_EXTRA_REQUIREMENTS")
OPT_VARS=()
while [ "x$1" != "x" ]; do
@ -321,6 +321,10 @@ while [ "x$1" != "x" ]; do
shift
done
if [ -z "$OPT_REQARGS" ]; then
OPT_REQARGS=("-r" "$OOOQ_BASE_REQUIREMENTS" "-r" "$OOOQ_EXTRA_REQUIREMENTS")
fi
if [ "$PRINT_LOGO" = 1 ]; then
print_logo
echo "..."