diff options
| -rw-r--r-- | releasenotes/notes/kolla-ansible-diff-50de16722aa155dc.yaml | 5 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/releasenotes/notes/kolla-ansible-diff-50de16722aa155dc.yaml b/releasenotes/notes/kolla-ansible-diff-50de16722aa155dc.yaml new file mode 100644 index 000000000..f3d95c28b --- /dev/null +++ b/releasenotes/notes/kolla-ansible-diff-50de16722aa155dc.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds two new arguments to the ``kolla-ansible`` command, ``--check`` + and ``--diff``. They are passed through directly to ``ansible-playbook``. diff --git a/tools/kolla-ansible b/tools/kolla-ansible index a6d222b7a..0b4a0897f 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -140,6 +140,8 @@ Can be specified multiple times to pass multiple inventories. --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 + --check, -C Don't make any changes and try to predict some of the changes that may occur instead + --diff, -D Show differences in ansible-playbook changed tasks --verbose, -v Increase verbosity of ansible-playbook Environment variables: @@ -191,6 +193,8 @@ cat <<EOF --vault-id --ask-vault-pass --vault-password-file +--check -C +--diff -D --verbose -v prechecks check @@ -218,8 +222,8 @@ EOF check_environment_coherence -SHORT_OPTS="hi:p:t:k:e:v" -LONG_OPTS="help,inventory:,playbook:,skip-tags:,tags:,key:,extra:,verbose,configdir:,passwords:,limit:,forks:,vault-id:,ask-vault-pass,vault-password-file:,yes-i-really-really-mean-it,include-images,include-dev:,full,incremental" +SHORT_OPTS="hi:p:t:k:e:CD:v" +LONG_OPTS="help,inventory:,playbook:,skip-tags:,tags:,key:,extra:,check,diff,verbose,configdir:,passwords:,limit:,forks:,vault-id:,ask-vault-pass,vault-password-file:,yes-i-really-really-mean-it,include-images,include-dev:,full,incremental" RAW_ARGS="$*" ARGS=$(getopt -o "${SHORT_OPTS}" -l "${LONG_OPTS}" --name "$0" -- "$@") || { usage >&2; exit 2; } @@ -265,6 +269,16 @@ while [ "$#" -gt 0 ]; do shift 2 ;; + (--check|-C) + EXTRA_OPTS="$EXTRA_OPTS --check" + shift 1 + ;; + + (--diff|-D) + EXTRA_OPTS="$EXTRA_OPTS --diff" + shift 1 + ;; + (--verbose|-v) VERBOSITY="$VERBOSITY --verbose" shift 1 |