Skip to content

Commit 69233f6

Browse files
committed
add jws_enable for consistency with other mw collection
1 parent 44e0d22 commit 69233f6

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

roles/jws/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
jws_enable: False
23
# comma separated list of wars to undeploy
34
# example: jws_apps_to_remove: 'docs,ROOT,examples'
45
jws_apps_to_remove: 'examples'

roles/jws/meta/argument_specs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ argument_specs:
436436
type: "str"
437437
downstream:
438438
options:
439+
jws_enable:
440+
default: True
441+
description: "Wheter or not to use JWS instead of uptream"
442+
type: "bool"
439443
jws_version:
440444
default: "6.0.0"
441445
description: "JWS version to install"

roles/jws/tasks/install/deploy_archive.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
- name: "Retrieve zipfiles, if missing, from RHN (if credentials provided)"
1919
ansible.builtin.include_tasks: download_from_rhn.yml
2020
when:
21+
- jws_enable is defined and jws_enable
2122
- rhn_username is defined and rhn_username | length > 0
2223
- rhn_password is defined and rhn_password | length > 0
2324

2425
- name: "Retrieve zipfiles from URL (if provided)."
2526
ansible.builtin.include_tasks: url.yml
2627
when:
27-
- not rhn_username is defined
28-
- not rhn_password is defined
28+
- not jws_enable is defined or not jws_enable
2929
- zipfile_url is defined
3030

3131
- name: "Copy archives {{ path_to_zipfile_local }} to target nodes: {{ path_to_zipfile_on_target }}"

0 commit comments

Comments
 (0)