openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add the keyfile option to decrypt the passwords.yml"

Browse Source
This commit is contained in:
Jenkins 2016-01-27 10:23:18 +00:00 committed by Gerrit Code Review
commit c533945d8a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/kolla-ansible
View File

@ -30,6 +30,7 @@ Usage: $0 COMMAND [options]
Options: Options:
--inventory, -i <inventory_path> Specify path to ansible inventory file --inventory, -i <inventory_path> Specify path to ansible inventory file
--playbook, -p <playbook_path> Specify path to ansible playbook file --playbook, -p <playbook_path> Specify path to ansible playbook file
--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
@ -41,9 +42,11 @@ Commands:
EOF EOF
} }
SHORT_OPTS="hi:p:t:"
LONG_OPTS="help,inventory:,playbook:,tags:" SHORT_OPTS="hi:p:t:k:"
LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:"
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"
find_base_dir find_base_dir
@ -69,6 +72,12 @@ while [ "$#" -gt 0 ]; do
shift 2 shift 2
;; ;;
(--keyfile|-k)
VAULT_PASS_FILE="$2"
EXTRA_OPTS="$EXTRA_OPTS --vault-password-file=$VAULT_PASS_FILE"
shift 2
;;
(--help|-h) (--help|-h)
usage usage
shift shift