Merge "Add config parameter to collect-logs ci-script"

This commit is contained in:
Jenkins 2016-09-12 15:39:42 +00:00 committed by Gerrit Code Review
commit 3d97f60654
1 changed files with 6 additions and 1 deletions

View File

@ -3,6 +3,10 @@
set -eux
# Note(hrybacki): Config used by collect-logs should be the same used by
# TripleO Quickstart during deployment
CONFIG=$1
export ANSIBLE_INVENTORY=$WORKSPACE/hosts
export ANSIBLE_CONFIG=$WORKSPACE/tripleo-quickstart/ansible.cfg
export SSH_CONFIG=$WORKSPACE/ssh.config.ansible
@ -20,6 +24,7 @@ bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
--bootstrap \
--retain-inventory \
--requirements $WORKSPACE/tripleo-quickstart/quickstart-role-requirements.txt \
--config $WORKSPACE/config/general_config/centosci-logs.yml \
--config $WORKSPACE/config/general_config/$CONFIG.yml \
--playbook collect-logs.yml \
--extra-vars @$WORKSPACE/config/general_config/centosci-logs.yml \
localhost