aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2016-05-24 10:29:33 -0700
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-05-31 09:21:13 +0530
commit6c4c24044b6d5ea7f59904bc218f2f21ee3fbdec (patch)
treed937699093acc9dc9b146e34e61029d1f47d2768 /tools
parentc518baafd10789d7d4ad065f4f3914a7e1d8500b (diff)
downloadkolla-6c4c24044b6d5ea7f59904bc218f2f21ee3fbdec.tar.gz
kolla-6c4c24044b6d5ea7f59904bc218f2f21ee3fbdec.zip
change keyfile to key
All files used by kolla-ansible do not have a file ending. keyfile was added as an anomoly. I noticed this during a review that coolsvap had underway where he did a similar thing. I think --key is fine. TrivialFix Change-Id: I99867a1a04a4dd881dcb2af39946122ea6b7d8a3
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kolla-ansible6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 3a8ffd2ab..f6bce81ba 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -31,7 +31,7 @@ Options:
--inventory, -i <inventory_path> Specify path to ansible inventory file
--playbook, -p <playbook_path> Specify path to ansible playbook file
--configdir <config_path> Specify path to directory with globals.yml
- --keyfile, -k <key_file> Specify path to ansible vault keyfile
+ --key -k <key_path> Specify path to ansible vault keyfile
--help, -h Show this usage information
--tags, -t <tags> Only run plays and tasks tagged with these values
--extra, -e <ansible variables> Set additional variables as key=value or YAML/JSON passed to ansible-playbook
@@ -54,7 +54,7 @@ EOF
SHORT_OPTS="hi:p:t:k:e:v"
-LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:,extra:,verbose,configdir:,passwords:,"
+LONG_OPTS="help,inventory:,playbook:,tags:,key:,extra:,verbose,configdir:"
ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; }
eval set -- "$ARGS"
@@ -96,7 +96,7 @@ while [ "$#" -gt 0 ]; do
shift 2
;;
- (--keyfile|-k)
+ (--key|-k)
VAULT_PASS_FILE="$2"
EXTRA_OPTS="$EXTRA_OPTS --vault-password-file=$VAULT_PASS_FILE"
shift 2