Skip to content

Commit 211f916

Browse files
committed
use adf acs_play vars
1 parent b83107f commit 211f916

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

playbooks/acs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
when: identity_enabled
5757
ansible.builtin.set_fact:
5858
identity_url: "{{ alfresco_url }}/auth"
59-
code_flow_pkce_supported: "{{ adw_version is version('4.5.0', 'ge') }}"
59+
code_flow_pkce_supported: "{{ acs_play_adw_version is version('4.5.0', 'ge') }}"
6060

6161
- name: Database Role
6262
hosts: database[0]
@@ -403,7 +403,7 @@
403403
adf_app_port: 8881
404404
adf_app_src_archive: "{{ acc_url }}"
405405
adf_app_src_checksum: "{{ acc_checksum }}"
406-
adf_app_version: "{{ acc_version }}"
406+
adf_app_version: "{{ acs_play_acc_version }}"
407407
adf_app_configuration: >-
408408
{{
409409
adf_app_oauth_configuration | default({}) |
@@ -418,7 +418,7 @@
418418
acc:
419419
artifact_name: "{{ acc_artifact_id }}"
420420
repository: "{{ acc_repository }}"
421-
version: "{{ acc_version }}"
421+
version: "{{ acs_play_acc_version }}"
422422
ansible.builtin.blockinfile:
423423
block: "{{ acc_components | to_nice_yaml(indent=2) }}"
424424
create: true
@@ -434,7 +434,7 @@
434434
gather_facts: false
435435
vars:
436436
adw_sum: >-
437-
{% if adw_version is version('4.1.0','ge') -%}
437+
{% if acs_play_adw_version is version('4.1.0','ge') -%}
438438
{{ adw_checksum }}
439439
{% else -%}
440440
{{ adw_checksum.split(':')[0] }}:
@@ -450,7 +450,7 @@
450450
adf_app_src_checksum: "{{ adw_sum }}"
451451
adf_app_src_username: "{{ nexus_user }}"
452452
adf_app_src_password: "{{ nexus_password }}"
453-
adf_app_version: "{{ adw_version }}"
453+
adf_app_version: "{{ acs_play_adw_version }}"
454454
adf_app_configuration: >-
455455
{{
456456
adf_app_oauth_configuration | default({}) |
@@ -465,7 +465,7 @@
465465
adw:
466466
artifact_name: "{{ adw_artifact_id }}"
467467
repository: "{{ adw_repository }}"
468-
version: "{{ adw_version }}"
468+
version: "{{ acs_play_adw_version }}"
469469
ansible.builtin.blockinfile:
470470
block: "{{ adw_components | to_nice_yaml(indent=2) }}"
471471
create: true

playbooks/group_vars/acc.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
acc_artifact_id: alfresco-control-center
22
acc_repository: "{{ nexus_repository.releases }}"
3-
acc_v: "{{ acs_play_acc_version }}"
43
acc_url: >-
5-
{{ acc_repository }}/{{ acc_artifact_id }}/{{ acc_v }}/{{ acc_artifact_id }}-{{ acc_v }}.zip
4+
{{ acc_repository }}/{{ acc_artifact_id }}/{{ acs_play_acc_version }}/{{ acc_artifact_id }}-{{ acs_play_acc_version }}.zip
65
acc_checksum: sha1:{{ acc_url }}.sha1
76
acc_app_configuration: {}

playbooks/group_vars/adw.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
adw_artifact_id: alfresco-digital-workspace
22
adw_repository: "{{ nexus_repository.enterprise_releases }}"
3-
adw_v: "{{ acs_play_adw_version }}"
43
adw_url: >-
5-
{{ adw_repository }}/{{ adw_artifact_id }}/{{ adw_v }}/{{ adw_artifact_id }}-{{ adw_v }}.zip
4+
{{ adw_repository }}/{{ adw_artifact_id }}/{{ acs_play_adw_version }}/{{ adw_artifact_id }}-{{ acs_play_adw_version }}.zip
65
adw_checksum: sha1:{{ adw_url }}.sha1
76
adw_app_configuration:
87
plugins:

0 commit comments

Comments
 (0)