Skip to content

Commit 8a5c4d8

Browse files
authored
OPSEXP-3053 Refactor transformers role to use default vars (#1087)
1 parent f85089f commit 8a5c4d8

25 files changed

+103
-89
lines changed

.secrets.baseline

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"filename": "playbooks/acs.yml",
145145
"hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5",
146146
"is_verified": false,
147-
"line_number": 500
147+
"line_number": 506
148148
}
149149
],
150150
"roles/activemq/molecule/default/tests/test_activemq.py": [
@@ -187,16 +187,6 @@
187187
"is_secret": false
188188
}
189189
],
190-
"roles/transformers/tasks/main.yml": [
191-
{
192-
"type": "Secret Keyword",
193-
"filename": "roles/transformers/tasks/main.yml",
194-
"hashed_secret": "0eeb6b7bb932e8594b4ffe039dc15332f670cbd9",
195-
"is_verified": false,
196-
"line_number": 92,
197-
"is_secret": false
198-
}
199-
],
200190
"tests/molecule_it/script.sh": [
201191
{
202192
"type": "Secret Keyword",
@@ -208,5 +198,5 @@
208198
}
209199
]
210200
},
211-
"generated_at": "2025-02-20T20:40:33Z"
201+
"generated_at": "2025-02-21T13:10:34Z"
212202
}

7.3.N-extra-vars.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ api_explorer:
2121
artifact_name: api-explorer
2222
repository: "{{ nexus_repository.releases }}"
2323
version: 7.3.0
24-
transform:
25-
artifact_name: alfresco-transform-core-aio
26-
repository: "{{ nexus_repository.releases }}"
27-
version: 5.1.6
2824
dependencies_version:
2925
postgresql_connector: 42.6.1
3026
postgres_major_version: 14

7.4.N-extra-vars.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ api_explorer:
2424
artifact_name: api-explorer
2525
repository: "{{ nexus_repository.releases }}"
2626
version: 7.4.0
27-
transform:
28-
artifact_name: alfresco-transform-core-aio
29-
repository: "{{ nexus_repository.releases }}"
30-
version: 5.1.6
3127
dependencies_version:
3228
postgresql_connector: 42.6.1
3329
postgres_major_version: 14

docs/deployment-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ For example, to override the JAVA_OPTS environment variable for the All-In-One T
635635
all:
636636
children:
637637
transformers:
638-
tengine_environment:
638+
transformers_tengine_environment:
639639
JAVA_OPTS:
640640
- -Xms512m
641641
- -Xmx1g

group_vars/all.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,11 @@ api_explorer:
4747
artifact_name: api-explorer
4848
repository: "{{ nexus_repository.releases }}"
4949
version: 23.4.0
50-
transform:
51-
artifact_name: alfresco-transform-core-aio
52-
repository: "{{ nexus_repository.releases }}"
53-
version: 5.1.6
5450
downloads:
5551
acs_zip_url: >-
5652
{{ acs.repository }}/{{ acs.artifact_name }}/{{ acs.version }}/{{ acs.artifact_name }}-{{ acs.version }}.zip
5753
acs_zip_sha1_checksum_url: >-
5854
{{ acs.repository }}/{{ acs.artifact_name }}/{{ acs.version }}/{{ acs.artifact_name }}-{{ acs.version }}.zip.sha1
59-
transform_jar_url: >-
60-
{{ transform.repository }}/{{ transform.artifact_name }}/{{ transform.version }}/{{ transform.artifact_name }}-{{ transform.version }}.jar
61-
transform_jar_sha1_checksum_url: >-
62-
{{ transform.repository }}/{{ transform.artifact_name }}/{{ transform.version }}/{{ transform.artifact_name }}-{{ transform.version }}.jar.sha1
6355
war_downloads:
6456
- url: >-
6557
{{ api_explorer.repository }}/{{ api_explorer.artifact_name }}/{{ api_explorer.version }}/{{ api_explorer.artifact_name }}-{{ api_explorer.version }}.war

playbooks/acs.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
ansible.builtin.import_role:
186186
name: "../roles/transformers"
187187
vars:
188-
ats_keystore: "{{ transformers_keystore | default({}) }}"
188+
transformers_ats_keystore: "{{ transformers_keystore | default({}) }}"
189189
java_version: "{{ acs_play_java_version }}"
190190
transformers_libreoffice_version: "{{ acs_play_transformers_libreoffice_version }}"
191191
transformers_libreoffice_archive_url: "{{ acs_play_transformers_libreoffice_archive_url }}"
@@ -195,12 +195,18 @@
195195
transformers_pdf_archive_checksum_url: "{{ acs_play_transformers_pdf_archive_checksum_url }}"
196196
transformers_imagemagick_version: "{{ acs_play_transformers_imagemagick_version }}"
197197
transformers_imagemagick_repository: "{{ acs_play_transformers_imagemagick_repository }}"
198+
transformers_aio_version: "{{ acs_play_transformers_aio_version }}"
199+
transformers_aio_archive_url: "{{ acs_play_transformers_aio_download_archive_url }}"
200+
transformers_aio_archive_checksum_url: "{{ acs_play_transformers_aio_download_archive_sha1_checksum_url }}"
198201
post_tasks:
199202
- name: Update installation status file with Transformers
200203
become: true
201204
vars:
202205
transform_components:
203-
transform: "{{ transform }}"
206+
transform:
207+
artifact_name: "{{ acs_play_transformers_aio_artifact_name }}"
208+
repository: "{{ acs_play_transformers_aio_repository }}"
209+
version: "{{ acs_play_transformers_aio_version }}"
204210
ansible.builtin.blockinfile:
205211
block: "{{ transform_components | to_nice_yaml(indent=2) }}"
206212
create: true

playbooks/group_vars/transformers.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ acs_play_trouter_download_zip_url: "{{ acs_play_trouter_repository }}/{{ acs_pla
99
acs_play_trouter_download_zip_sha1_checksum_url: "sha1:{{ acs_play_trouter_download_zip_url }}.sha1"
1010

1111
acs_play_transformers_libreoffice_artifact_name: libreoffice-dist
12-
acs_play_transformers_libreoffice_archive_name: "{{ acs_play_transformers_libreoffice_artifact_name }}-{{ acs_play_transformers_libreoffice_version }}-{{ pkg_format }}.gz"
12+
acs_play_transformers_libreoffice_archive_name: "{{ acs_play_transformers_libreoffice_artifact_name }}-{{ acs_play_transformers_libreoffice_version }}-{{ transformers_pkg_format }}.gz"
1313
acs_play_transformers_libreoffice_repository: "{{ artifacts_repositories.community.base_url }}/repositories/thirdparty/org/libreoffice"
1414
acs_play_transformers_libreoffice_archive_url: "{{ acs_play_transformers_libreoffice_repository }}/{{ acs_play_transformers_libreoffice_artifact_name }}/{{ acs_play_transformers_libreoffice_version }}/{{ acs_play_transformers_libreoffice_archive_name }}"
1515
acs_play_transformers_libreoffice_archive_checksum_url: "sha1:{{ acs_play_transformers_libreoffice_archive_url }}.sha1"
@@ -21,3 +21,8 @@ acs_play_transformers_pdf_archive_url: "{{ acs_play_transformers_pdf_repository
2121
acs_play_transformers_pdf_archive_checksum_url: "sha1:{{ acs_play_transformers_pdf_archive_url }}.sha1"
2222

2323
acs_play_transformers_imagemagick_repository: "{{ nexus_repository.releases }}"
24+
25+
acs_play_transformers_aio_artifact_name: alfresco-transform-core-aio
26+
acs_play_transformers_aio_repository: "{{ nexus_repository.releases }}"
27+
acs_play_transformers_aio_download_archive_url: "{{ acs_play_transformers_aio_repository }}/{{ acs_play_transformers_aio_artifact_name }}/{{ acs_play_transformers_aio_version }}/{{ acs_play_transformers_aio_artifact_name }}-{{ acs_play_transformers_aio_version }}.jar"
28+
acs_play_transformers_aio_download_archive_sha1_checksum_url: "sha1:{{ acs_play_transformers_aio_download_archive_url }}.sha1"

playbooks/prerun-upgrade-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
ansible.builtin.fail:
5555
when:
5656
- installed_components.transform is defined
57-
- transform.version != installed_components.transform.version
57+
- acs_play_transformers_aio_version != installed_components.transform.version
5858

5959
- name: Fail on unsupported Trouter upgrades
6060
ansible.builtin.fail:

roles/transformers/defaults/main.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
# defaults file for roles/transformers
3-
pkg_format: "{% if ansible_pkg_mgr == 'apt' %}deb{% else %}rpm{% endif %}"
4-
tengine_environment:
3+
transformers_pkg_format: "{% if ansible_pkg_mgr == 'apt' %}deb{% else %}rpm{% endif %}"
4+
transformers_tengine_environment:
55
JAVA_OPTS:
66
- -Xms512m
77
- -Xmx1536m
8-
ats_keystore: {}
9-
include_ghostscript: false
8+
transformers_ats_keystore: {}
9+
transformers_include_ghostscript: false
1010

1111
transformers_libreoffice_artifact_name: libreoffice-dist
1212
transformers_libreoffice_repository: https://artifacts.alfresco.com/nexus/content/repositories/thirdparty/org/libreoffice
1313

1414
transformers_libreoffice_version: 7.2.5.1
15-
transformers_libreoffice_archive_name: "{{ transformers_libreoffice_artifact_name }}-{{ transformers_libreoffice_version }}-{{ pkg_format }}.gz"
15+
transformers_libreoffice_archive_name: "{{ transformers_libreoffice_artifact_name }}-{{ transformers_libreoffice_version }}-{{ transformers_pkg_format }}.gz"
1616
transformers_libreoffice_archive_url: "{{ transformers_libreoffice_repository }}/{{ transformers_libreoffice_artifact_name }}/{{ transformers_libreoffice_version }}/{{ transformers_libreoffice_archive_name }}"
1717
transformers_libreoffice_archive_checksum_url: "sha1:{{ transformers_libreoffice_archive_url }}.sha1"
1818
transformers_libreoffice_home: "/opt/libreoffice{{ transformers_libreoffice_version[0:3] }}/"
@@ -27,3 +27,10 @@ transformers_pdf_archive_checksum_url: "sha1:{{ transformers_pdf_archive_url }}.
2727

2828
transformers_imagemagick_version: 7.1.0-16-ci-11
2929
transformers_imagemagick_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco
30+
31+
transformers_aio_artifact_name: alfresco-transform-core-aio
32+
transformers_aio_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco
33+
34+
transformers_aio_version: 5.1.6
35+
transformers_aio_archive_url: "{{ transformers_aio_repository }}/{{ transformers_aio_artifact_name }}/{{ transformers_aio_version }}/{{ transformers_aio_artifact_name }}-{{ transformers_aio_version }}.jar"
36+
transformers_aio_archive_checksum_url: "sha1:{{ transformers_aio_archive_url }}.sha1"

roles/transformers/meta/argument_specs.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ argument_specs:
33
main:
44
short_description: Main entrypoint for the tranformers role
55
options:
6-
ats_keystore:
6+
transformers_pkg_format:
7+
type: str
8+
required: false
9+
description: |
10+
Package format to use for the transformers installation.
11+
Possible values are 'deb' or 'rpm'.
12+
transformers_ats_keystore:
713
type: dict
814
required: false
915
no_log: true
@@ -50,3 +56,18 @@ argument_specs:
5056
required: false
5157
description: |
5258
URL of the repository where the ImageMagick distribution is stored.
59+
transformers_aio_artifact_name:
60+
type: str
61+
required: false
62+
description: |
63+
The name of the transformers All-In-One artifact.
64+
transformers_aio_archive_url:
65+
type: str
66+
required: false
67+
description: |
68+
The URL to download the transformers All-In-One artifact.
69+
transformers_aio_archive_checksum_url:
70+
type: str
71+
required: false
72+
description: |
73+
The URL to download the checksum of the transformers All-In-One artifact.

0 commit comments

Comments
 (0)