diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-09-15 20:02:23 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-09-19 17:45:55 +0200 |
| commit | 684194ff9dbd442a93278bec2cef95a21fa62811 (patch) | |
| tree | cec53bdf011429aeb56b0a3698a4801764e85d43 /tools | |
| parent | 9b5a01336f89bf959a38492189d19127be01d3df (diff) | |
| download | kolla-ansible-684194ff9dbd442a93278bec2cef95a21fa62811.tar.gz kolla-ansible-684194ff9dbd442a93278bec2cef95a21fa62811.zip | |
Add support for vault passwords
This change adds vault arguments to kolla-ansible
to allow usage of vault encrypted files.
Change-Id: I1dbae6e949543585d11c21e67e82f559d343b4ad
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/kolla-ansible | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 63692267a..8c2bd3cd7 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -43,6 +43,9 @@ Options: --extra, -e <ansible variables> Set additional variables as key=value or YAML/JSON passed to ansible-playbook --passwords <passwords_path> Specify path to the passwords file --limit <host> Specify host to run plays + --vault-id <@prompt or path> Specify @prompt or password file (Ansible >= 2.4) + --ask-vault-pass Ask for vault password + --vault-password-file <path> Specify password file for vault decrypt --verbose, -v Increase verbosity of ansible-playbook Commands: @@ -77,6 +80,9 @@ cat <<EOF --extra -e --passwords --limit +--vault-id +--ask-vault-pass +--vault-password-file --verbose -v prechecks check @@ -97,7 +103,7 @@ EOF } SHORT_OPTS="hi:p:t:k:e:v" -LONG_OPTS="help,inventory:,playbook:,tags:,key:,extra:,verbose,configdir:,passwords:,limit:,yes-i-really-really-mean-it,include-images,include-dev" +LONG_OPTS="help,inventory:,playbook:,tags:,key:,extra:,verbose,configdir:,passwords:,limit:,vault-id:,ask-vault-pass,vault-password-file:,yes-i-really-really-mean-it,include-images,include-dev" ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; } eval set -- "$ARGS" @@ -170,15 +176,32 @@ while [ "$#" -gt 0 ]; do EXTRA_OPTS="$EXTRA_OPTS -e $2" shift 2 ;; + (--passwords) PASSWORDS_FILE="$2" shift 2 ;; + (--limit) EXTRA_OPTS="$EXTRA_OPTS --limit $2" shift 2 ;; + (--vault-id) + EXTRA_OPTS="$EXTRA_OPTS --vault-id $2" + shift 2 + ;; + + (--ask-vault-pass) + VERBOSITY="$EXTRA_OPTS --ask-vault-pass" + shift 1 + ;; + + (--vault-password-file) + EXTRA_OPTS="$EXTRA_OPTS --vault-password-file $2" + shift 2 + ;; + (--help|-h) usage shift |