Merge "change keyfile to key"

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