openstack/kolla-ansible
Code Issues Proposed changes

Merge "Increase ansible verbosity during gate deploy"

Browse Source
This commit is contained in:
Jenkins 2016-02-09 17:37:06 +00:00 committed by Gerrit Code Review
commit 1fdae5b9d0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deploy_aio.sh
View File

@ -34,7 +34,7 @@ EOF
ip l a fake_interface type dummy ip l a fake_interface type dummy
# Actually do the deployment # Actually do the deployment
tools/kolla-ansible deploy tools/kolla-ansible -vvv deploy
check_failure check_failure

14
tools/kolla-ansible
View File

@ -33,6 +33,7 @@ Options:
--keyfile, -k <key_file> Specify path to ansible vault keyfile --keyfile, -k <key_file> Specify path to ansible vault keyfile
--help, -h Show this usage information --help, -h Show this usage information
--tags, -t <tags> Only run plays and tasks tagged with these values --tags, -t <tags> Only run plays and tasks tagged with these values
--verbose, -v Increase verbosity of ansible-playbook
Commands: Commands:
prechecks Do pre-deployment checks for hosts prechecks Do pre-deployment checks for hosts
@ -43,8 +44,8 @@ EOF
} }
SHORT_OPTS="hi:p:t:k:" SHORT_OPTS="hi:p:t:k:v"
LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:" LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:,verbose"
ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; } ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; }
eval set -- "$ARGS" eval set -- "$ARGS"
@ -54,6 +55,7 @@ find_base_dir
INVENTORY="${BASEDIR}/ansible/inventory/all-in-one" INVENTORY="${BASEDIR}/ansible/inventory/all-in-one"
PLAYBOOK="${BASEDIR}/ansible/site.yml" PLAYBOOK="${BASEDIR}/ansible/site.yml"
EXTRA_OPTS="-e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml" EXTRA_OPTS="-e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml"
VERBOSITY=
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
case "$1" in case "$1" in
@ -67,11 +69,17 @@ while [ "$#" -gt 0 ]; do
PLAYBOOK="$2" PLAYBOOK="$2"
shift 2 shift 2
;; ;;
(--tags|-t) (--tags|-t)
EXTRA_OPTS="$EXTRA_OPTS --tags $2" EXTRA_OPTS="$EXTRA_OPTS --tags $2"
shift 2 shift 2
;; ;;
(--verbose|-v)
VERBOSITY="$VERBOSITY --verbose"
shift 1
;;
(--keyfile|-k) (--keyfile|-k)
VAULT_PASS_FILE="$2" VAULT_PASS_FILE="$2"
EXTRA_OPTS="$EXTRA_OPTS --vault-password-file=$VAULT_PASS_FILE" EXTRA_OPTS="$EXTRA_OPTS --vault-password-file=$VAULT_PASS_FILE"
@ -124,5 +132,5 @@ case "$1" in
;; ;;
esac esac
CMD="ansible-playbook -i $INVENTORY $EXTRA_OPTS $PLAYBOOK" CMD="ansible-playbook -i $INVENTORY $EXTRA_OPTS $PLAYBOOK $VERBOSITY"
process_cmd process_cmd