OPSEXP-3162 Replace extra-vars files with the acs_play_major_version var

.secrets.baseline

@@ -153,7 +153,7 @@
         "filename": "roles/activemq/molecule/default/tests/test_activemq.py",
         "hashed_secret": "5316033288e30573a91a5401b359fa398f56bf17",
         "is_verified": false,
-        "line_number": 19,
+        "line_number": 18,
         "is_secret": false
       }
     ],
@@ -188,5 +188,5 @@
       }
     ]
   },
-  "generated_at": "2025-03-10T12:30:17Z"
+  "generated_at": "2025-03-11T08:48:02Z"
 }

group_vars/all.yml

@@ -1 +1 @@
-acs_play_major_version: 23
+# All vars have been moved to playbook/group_vars/*.yml and to version specific vars/*.yml files.

molecule/default/molecule.yml

@@ -35,12 +35,11 @@ provisioner:
       pipelining: True
   ansible_args:
     - -e
-    - "@../../${MOLECULE_IT_EXTRA_VARS}"
+    - "${MOLECULE_IT_EXTRA_VARS}"
     - -e
     - "@../../tests/test-ssl.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
   playbooks:
     converge: ../../playbooks/acs.yml

molecule/default/vars-rhel8.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-07cca573a2270b39a # RHEL-8.9.0_HVM-20240327-x86_64-4-Hourly2-GP3
-MOLECULE_IT_EXTRA_VARS: 7.4.N-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_major_version=74
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.4.json
 MOLECULE_IT_PLATFORM: rhel8

molecule/default/vars-rocky8.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-0ee382512e653ec35 # Rocky-8-EC2-Base-8.10-20240528.0.x86_64
-MOLECULE_IT_EXTRA_VARS: 7.4.N-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_major_version=74
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.4.json
 MOLECULE_IT_PLATFORM: rocky8-74

molecule/default/vars-rocky9.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-0230bf6b41b114fef # Rocky-9-EC2-Base-9.4-20240523.0.x86_64
-MOLECULE_IT_EXTRA_VARS: tests/test-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_major_version=23
 MOLECULE_IT_TEST_CONFIG: tests/test-config.json
 MOLECULE_IT_PLATFORM: rocky9

molecule/default/vars-ubuntu-community.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-0e9085e60087ce171 # amazon/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20241109
-MOLECULE_IT_EXTRA_VARS: community-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_repository_acs_edition=Community
 MOLECULE_IT_TEST_CONFIG: tests/test-config-community.json
 MOLECULE_IT_PLATFORM: ubuntu-community

molecule/default/vars-ubuntu22-73.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-032a56ad5e480189c # ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250112
-MOLECULE_IT_EXTRA_VARS: 7.3.N-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_major_version=73
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json
 MOLECULE_IT_PLATFORM: ubuntu22-73

molecule/docker_community/molecule.yml

@@ -34,10 +34,9 @@ provisioner:
       pipelining: true
   ansible_args:
     - -e
-    - "@../../community-extra-vars.yml"
+    - "acs_play_repository_acs_edition=Community"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
   playbooks:
     prepare: ../default/prepare.yml

molecule/docker_enterprise/molecule.yml

@@ -43,7 +43,6 @@ provisioner:
     - "@../../tests/test-ssl.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
   playbooks:
     prepare: ../default/prepare.yml

molecule/elasticsearch/molecule.yml

@@ -43,7 +43,6 @@ provisioner:
     - autogen_unsecure_secrets=true
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
   playbooks:
     prepare: ../default/prepare.yml

molecule/identity/molecule.yml

@@ -32,12 +32,8 @@ provisioner:
   config_options:
     defaults:
       pipelining: True
-  ansible_args:
-    - -e
-    - "@../../tests/test-extra-vars.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
 verifier:
   name: ansible

molecule/multimachine/molecule.yml

@@ -136,12 +136,11 @@ provisioner:
       pipelining: True
   ansible_args:
     - -e
-    - "@../../${MOLECULE_IT_EXTRA_VARS}"
+    - "${MOLECULE_IT_EXTRA_VARS}"
     - -e
     - "@../../tests/test-ssl.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: ./host_vars
       hosts: ./hosts.yml
   playbooks:

molecule/multimachine/vars.yml

@@ -1,4 +1,4 @@
 MOLECULE_IT_IMAGE_ID: ami-07d4917b6f95f5c2a # RHEL-9.4.0_HVM-20240605-x86_64-82-Hourly2-GP3
-MOLECULE_IT_EXTRA_VARS: tests/test-extra-vars.yml
+MOLECULE_IT_EXTRA_VARS: acs_play_major_version=23
 MOLECULE_IT_TEST_CONFIG: tests/test-config.json
 MOLECULE_IT_PLATFORM: multimachine

molecule/opensearch/molecule.yml

@@ -34,7 +34,6 @@ provisioner:
     - "@../../tests/test-ssl.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: ./host_vars
       hosts: ./hosts.yml
   playbooks:

molecule/pki/molecule.yml

@@ -39,7 +39,6 @@ provisioner:
     converge: ../../playbooks/acs.yml
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
 verifier:
   name: ansible

molecule/prerun_network_checks/molecule.yml

@@ -37,7 +37,6 @@ provisioner:
     - "@../../tests/test-ssl.yml"
   inventory:
     links:
-      group_vars: ../../group_vars
       host_vars: host_vars
 verifier:
   name: ansible

playbooks/acs.yml

@@ -2,6 +2,9 @@
 - name: Include vars based on acs major version
   ansible.builtin.import_playbook: include-vars.yml
 
+- name: Set dynamic facts for play
+  ansible.builtin.import_playbook: dynamic-facts.yml
+
 - name: Check if current OS version is in the supported matrix
   hosts: all:!external
   gather_facts: true
@@ -29,9 +32,6 @@
 - name: Handle secrets
   ansible.builtin.import_playbook: secrets.yml
 
-- name: Set dynamic facts for play
-  ansible.builtin.import_playbook: dynamic-facts.yml
-
 - name: Generate hosts certificates
   vars:
     p12_passphrase: "{{ hostvars.localhost.certs_p12_passphrase }}"

playbooks/dynamic-facts.yml

@@ -12,3 +12,13 @@
     - name: Set acs edition
       ansible.builtin.set_fact:
         acs_is_enterprise: "{{ acs_play_repository_acs_edition == 'Enterprise' }}"
+
+    - name: Override repo related vars when using community
+      ansible.builtin.set_fact:
+        acs_play_repository_acs_version: "{{ acs_play_community_repository_acs_version }}"
+        acs_play_repository_acs_repository: "{{ acs_play_community_repository_acs_repository }}"
+        acs_play_repository_acs_artifact_name: "{{ acs_play_community_repository_acs_artifact_name }}"
+        acs_play_repository_amp_googledrive_repo_version: "{{ acs_play_community_repository_amp_googledrive_repo_version }}"
+        acs_play_repository_amp_googledrive_repo_repository: "{{ acs_play_community_repository_amp_googledrive_repo_repository }}"
+        acs_play_repository_amp_googledrive_repo_artifact_name: "{{ acs_play_community_repository_amp_googledrive_repo_artifact_name }}"
+      when: not acs_is_enterprise

playbooks/group_vars/all.yml

@@ -3,6 +3,7 @@
 # For more information please have a look at the
 # [security_doc](https://github.com/Alfresco/alfresco-ansible-deployment/blob/master/docs/SECURITY.md#specify-trustworthy-applications)
 acs_play_known_urls: []
+acs_play_major_version: 23
 
 artifacts_repositories:
   enterprise:

playbooks/group_vars/repository.yml

@@ -3,6 +3,10 @@ acs_play_repository_acs_repository: "{{ nexus_repository.enterprise_releases }}"
 acs_play_repository_acs_archive_url: "{{ acs_play_repository_acs_repository }}/{{ acs_play_repository_acs_artifact_name }}/{{ acs_play_repository_acs_version }}/{{ acs_play_repository_acs_artifact_name }}-{{ acs_play_repository_acs_version }}.zip"
 acs_play_repository_acs_archive_checksum_url: "sha1:{{ acs_play_repository_acs_archive_url }}.sha1"
 
+# Section for community vars
+acs_play_community_repository_acs_artifact_name: alfresco-content-services-community-distribution
+acs_play_community_repository_acs_repository: "{{ nexus_repository.releases }}"
+
 acs_play_repository_jdbc_driver_class: "{{ default_jdbc_pg_driver_class }}"
 acs_play_repository_jdbc_driver_version: "{{ acs_play_jdbc_pg_driver_version }}"
 acs_play_repository_jdbc_driver_url: >-
@@ -26,6 +30,9 @@ acs_play_repository_amp_googledrive_repo_artifact_name: alfresco-googledrive-rep
 acs_play_repository_amp_googledrive_repo_repository: "{{ nexus_repository.enterprise_releases }}/integrations"
 acs_play_repository_amp_googledrive_repo_archive_url: "{{ acs_play_repository_amp_googledrive_repo_repository }}/{{ acs_play_repository_amp_googledrive_repo_artifact_name }}/{{ acs_play_repository_amp_googledrive_repo_version }}/{{ acs_play_repository_amp_googledrive_repo_artifact_name }}-{{ acs_play_repository_amp_googledrive_repo_version }}.amp"
 
+acs_play_community_repository_amp_googledrive_repo_artifact_name: alfresco-googledrive-repo-community
+acs_play_community_repository_amp_googledrive_repo_repository: "{{ nexus_repository.releases }}/integrations"
+
 acs_play_repository_amp_googledrive_share_artifact_name: alfresco-googledrive-share
 acs_play_repository_amp_googledrive_share_repository: "{{ nexus_repository.releases }}/integrations"
 acs_play_repository_amp_googledrive_share_archive_url: "{{ acs_play_repository_amp_googledrive_share_repository }}/{{ acs_play_repository_amp_googledrive_share_artifact_name }}/{{ acs_play_repository_amp_googledrive_share_version }}/{{ acs_play_repository_amp_googledrive_share_artifact_name }}-{{ acs_play_repository_amp_googledrive_share_version }}.amp"

roles/activemq/molecule/default/molecule.yml

@@ -34,7 +34,6 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: testinfra
   env:

roles/activemq/molecule/default/tests/test_activemq.py

@@ -15,13 +15,11 @@ def get_ansible_vars(host):
     common_vars = "file=../../../common/vars/main.yml name=common_vars"
     common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
     activemq_defaults = "file=../../defaults/main.yml name=activemq_defaults"
-    group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     secrets_vars = "file=../../../../vars/secrets.yml name=secrets_vars"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", common_defaults)["ansible_facts"]["common_defaults"])
     ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
     ansible_vars.update(host.ansible("include_vars", activemq_role)["ansible_facts"]["activemq_role"])
-    ansible_vars.update(host.ansible("include_vars", group_vars)["ansible_facts"]["group_vars"])
     ansible_vars.update(host.ansible("include_vars", secrets_vars)["ansible_facts"]["secrets_vars"])
     ansible_vars.update(host.ansible("include_vars", activemq_defaults)["ansible_facts"]["activemq_defaults"])
     return ansible_vars

roles/adf_app/molecule/default/molecule.yml

@@ -20,6 +20,5 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: ansible

roles/audit_storage/molecule/default/molecule.yml

@@ -26,7 +26,6 @@ provisioner:
     - "@../../../../tests/molecule/secrets.yml"
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: ansible

roles/common/molecule/default/molecule.yml

@@ -24,7 +24,6 @@ provisioner:
       pipelining: True
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: testinfra

roles/elasticsearch/molecule/default/molecule.yml

@@ -22,6 +22,5 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: ansible

roles/identity/molecule/default/molecule.yml

@@ -24,7 +24,6 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: ansible
 

roles/java/molecule/default/molecule.yml

@@ -22,5 +22,4 @@ provisioner:
       pipelining: True
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars

roles/nginx/molecule/default/molecule.yml

@@ -25,6 +25,5 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: ansible

roles/postgres/molecule/default/molecule.yml

@@ -29,7 +29,6 @@ provisioner:
       pipelining: True
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: testinfra

roles/repository/molecule/default/molecule.yml

@@ -31,14 +31,11 @@ provisioner:
   ansible_args:
     - -e
     - "@../../../../tests/molecule/secrets.yml"
-    - -e
-    - "@../../../../tests/test-extra-vars.yml"
   config_options:
     defaults:
       pipelining: true
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: testinfra

roles/repository/molecule/default/tests/test_repository.py

@@ -20,8 +20,6 @@ def get_ansible_vars(host):
     java_role = "file=../java/vars/main.yml name=java_role"
     common_vars = "file=../../../common/vars/main.yml name=common_vars"
     common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    group_vars = "file=../../../../group_vars/all.yml name=group_vars"
-    ansible_vars = host.ansible("include_vars", group_vars)["ansible_facts"]["group_vars"]
     ansible_vars.update(host.ansible("include_vars", common_defaults)["ansible_facts"]["common_defaults"])
     ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
     ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])

roles/search/molecule/default/molecule.yml

@@ -37,7 +37,6 @@ provisioner:
     - "@../../../../tests/molecule/secrets.yml"
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: testinfra

roles/search_enterprise/molecule/default/molecule.yml

@@ -27,7 +27,6 @@ provisioner:
     - "@../../../../tests/molecule/secrets.yml"
   inventory:
     links:
-      group_vars: ../../../../group_vars
       host_vars: host_vars
 verifier:
   name: ansible

roles/sfs/molecule/default/molecule.yml

@@ -25,7 +25,6 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: testinfra
   env:

roles/sync/molecule/default/molecule.yml

@@ -30,7 +30,6 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: testinfra
   env:

roles/sync/molecule/default/tests/test_sync.py

@@ -13,12 +13,10 @@ def get_ansible_vars(host):
     java_role = "file=../java/vars/main.yml name=java_role"
     common_vars = "file=../../../common/vars/main.yml name=common_vars"
     common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    common_hosts = "file=../../../../group_vars/all.yml name=common_hosts"
     syncservices = "file=../../vars/main.yml name=syncservices"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])
     ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
-    ansible_vars.update(host.ansible("include_vars", common_hosts)["ansible_facts"]["common_hosts"])
     ansible_vars.update(host.ansible("include_vars", common_defaults)["ansible_facts"]["common_defaults"])
     ansible_vars.update(host.ansible("include_vars", syncservices)["ansible_facts"]["syncservices"])
     return ansible_vars

roles/tomcat/molecule/default/molecule.yml

@@ -23,7 +23,6 @@ provisioner:
   inventory:
     links:
       host_vars: host_vars
-      group_vars: ../../../../group_vars
 verifier:
   name: testinfra
   env: