diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-30 09:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-30 09:48:59 +0000 |
| commit | 2bd896e3642804b54b7ef946277d64998721ffd0 (patch) | |
| tree | f8bd90989552d04d5526da5990514b1e5354621c /tools | |
| parent | a8e788819be2dd81f0765d68086913773f715ae2 (diff) | |
| parent | 25393eb28f34f693fc11228926c1c776e269609f (diff) | |
| download | kolla-2bd896e3642804b54b7ef946277d64998721ffd0.tar.gz kolla-2bd896e3642804b54b7ef946277d64998721ffd0.zip | |
Merge "Pass extra variables through kolla-ansible to ansible-playbook"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/kolla-ansible | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 11ed742c7..16634b268 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -34,6 +34,7 @@ Options: --keyfile, -k <key_file> 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 --verbose, -v Increase verbosity of ansible-playbook Commands: @@ -48,8 +49,8 @@ EOF } -SHORT_OPTS="hi:p:t:k:v" -LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:,verbose,configdir:" +SHORT_OPTS="hi:p:t:k:e:v" +LONG_OPTS="help,inventory:,playbook:,tags:,keyfile:,extra:,verbose,configdir:" ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; } eval set -- "$ARGS" @@ -96,6 +97,11 @@ while [ "$#" -gt 0 ]; do shift 2 ;; + (--extra|-e) + EXTRA_OPTS="$EXTRA_OPTS -e $2" + shift 2 + ;; + (--help|-h) usage shift |