File tree Expand file tree Collapse file tree 6 files changed +20
-6
lines changed Expand file tree Collapse file tree 6 files changed +20
-6
lines changed Original file line number Diff line number Diff line change 8
8
# the command line. I.e. we can set things without having to tweak values files
9
9
EXTRA_HELM_OPTS ?=
10
10
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
+
11
15
# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248
12
16
# or
13
17
# 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
111
115
.PHONY : load-iib
112
116
load-iib : # # CI target to install Index Image Bundles
113
117
@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; \
115
119
else \
116
120
echo " No INDEX_IMAGES defined. Bailing out" ; \
117
121
exit 1; \
Original file line number Diff line number Diff line change 23
23
24
24
PATTERN_NAME=$( basename " ` pwd` " )
25
25
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"
Original file line number Diff line number Diff line change @@ -13,4 +13,6 @@ PATTERNPATH=$(dirname "${COMMONPATH}")
13
13
14
14
PATTERN_NAME=${1:- $(basename " ` pwd` " )}
15
15
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"
Original file line number Diff line number Diff line change @@ -14,4 +14,6 @@ PATTERNPATH=$(dirname "${COMMONPATH}")
14
14
PATTERN_NAME=${1:- $(basename " ` pwd` " )}
15
15
SECRETS_BACKING_STORE=" $( $SCRIPTPATH /determine-secretstore-backend.sh) "
16
16
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"
Original file line number Diff line number Diff line change @@ -25,4 +25,6 @@ if [ -z ${TASK} ]; then
25
25
exit 1
26
26
fi
27
27
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"
Original file line number Diff line number Diff line change @@ -13,4 +13,6 @@ SCRIPTPATH=$(dirname "${SCRIPT}")
13
13
COMMONPATH=$( dirname " ${SCRIPTPATH} " )
14
14
PATTERNPATH=$( dirname " ${COMMONPATH} " )
15
15
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"
You can’t perform that action at this time.
0 commit comments