Skip to content

Commit 5315266

Browse files
authored
Merge pull request #621 from dminnear-rh/propagate-extra-playbook-opts
propagate the env var EXTRA_PLAYBOOK_OPTS to our ansible-playbook commands
2 parents 4d4de10 + 39882c7 commit 5315266

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ endif
88
# the command line. I.e. we can set things without having to tweak values files
99
EXTRA_HELM_OPTS ?=
1010

11+
# This variable can be set in order to pass additional ansible-playbook arguments from the
12+
# the command line. I.e. we can set -vvv for more verbose logging
13+
EXTRA_PLAYBOOK_OPTS ?=
14+
1115
# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248
1216
# or
1317
# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248,registry-proxy.engineering.redhat.com/rh-osbs/iib:394249
@@ -111,7 +115,7 @@ secrets-backend-none: ## Edits values files to remove secrets manager + ESO
111115
.PHONY: load-iib
112116
load-iib: ## CI target to install Index Image Bundles
113117
@set -e; if [ x$(INDEX_IMAGES) != x ]; then \
114-
ansible-playbook rhvp.cluster_utils.iib_ci; \
118+
ansible-playbook $(EXTRA_PLAYBOOK_OPTS) rhvp.cluster_utils.iib_ci; \
115119
else \
116120
echo "No INDEX_IMAGES defined. Bailing out"; \
117121
exit 1; \

scripts/display-secrets-info.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ fi
2323

2424
PATTERN_NAME=$(basename "`pwd`")
2525

26-
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" -e override_no_log=false "rhvp.cluster_utils.display_secrets_info"
26+
EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
27+
28+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" -e hide_sensitive_output=false ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.display_secrets_info"

scripts/load-k8s-secrets.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ PATTERNPATH=$(dirname "${COMMONPATH}")
1313

1414
PATTERN_NAME=${1:-$(basename "`pwd`")}
1515

16-
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "rhvp.cluster_utils.k8s_secrets"
16+
EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
17+
18+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.k8s_secrets"

scripts/process-secrets.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ PATTERNPATH=$(dirname "${COMMONPATH}")
1414
PATTERN_NAME=${1:-$(basename "`pwd`")}
1515
SECRETS_BACKING_STORE="$($SCRIPTPATH/determine-secretstore-backend.sh)"
1616

17-
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" "rhvp.cluster_utils.process_secrets"
17+
EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
18+
19+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" -e secrets_backing_store="${SECRETS_BACKING_STORE}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.process_secrets"

scripts/vault-utils.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ if [ -z ${TASK} ]; then
2525
exit 1
2626
fi
2727

28-
ansible-playbook -t "${TASK}" -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "rhvp.cluster_utils.vault"
28+
EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
29+
30+
ansible-playbook -t "${TASK}" -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.vault"

scripts/write-token-kubeconfig.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ SCRIPTPATH=$(dirname "${SCRIPT}")
1313
COMMONPATH=$(dirname "${SCRIPTPATH}")
1414
PATTERNPATH=$(dirname "${COMMONPATH}")
1515

16-
ansible-playbook -e pattern_dir="${PATTERNPATH}" -e kubeconfig_file="${OUTPUTFILE}" "rhvp.cluster_utils.write-token-kubeconfig"
16+
EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"
17+
18+
ansible-playbook -e pattern_dir="${PATTERNPATH}" -e kubeconfig_file="${OUTPUTFILE}" ${EXTRA_PLAYBOOK_OPTS} "rhvp.cluster_utils.write-token-kubeconfig"

0 commit comments

Comments
 (0)