aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-09-24 16:30:46 +0000
committerGerrit Code Review <review@openstack.org>2021-09-24 16:30:46 +0000
commit59e6688a0c63d5282dee2a03c30a72e3ecd302df (patch)
tree135f2a1d122bdce8dd5d8a0cf8cc17dc08b76f38
parent3101c5abc3b0111912d8dc4a83082010fbfbff4a (diff)
parent0e720b382b7914ff3cce715f2608bd92cad41a2d (diff)
downloadkolla-ansible-59e6688a0c63d5282dee2a03c30a72e3ecd302df.tar.gz
kolla-ansible-59e6688a0c63d5282dee2a03c30a72e3ecd302df.zip
Merge "Add check and diff options to kolla-ansible"
-rw-r--r--releasenotes/notes/kolla-ansible-diff-50de16722aa155dc.yaml5
-rwxr-xr-xtools/kolla-ansible18
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 208be612c..7b1a8b3b3 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:
@@ -192,6 +194,8 @@ cat <<EOF
--vault-id
--ask-vault-pass
--vault-password-file
+--check -C
+--diff -D
--verbose -v
prechecks
check
@@ -220,8 +224,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; }
@@ -267,6 +271,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