OPSEXP-3235 refactor: extract db common vars to the main playbook (#1174)

Co-authored-by: pmacius <[email protected]>
Co-authored-by: pmacius <[email protected]>

Author: gionn

.secrets.baseline

@@ -203,5 +203,5 @@
       }
     ]
   },
-  "generated_at": "2025-05-14T10:07:54Z"
+  "generated_at": "2025-05-23T12:57:23Z"
 }

playbooks/acs.yml

@@ -334,7 +334,7 @@
         tomcat_version: "{{ acs_play_tomcat_version }}" # noqa: var-naming[no-role-prefix]
         repository_nexus_username: "{{ nexus_user }}"
         repository_nexus_password: "{{ nexus_password }}"
-        repository_db_url: "{{ acs_play_repo_db_url }}"
+        repository_db_url: "{{ acs_play_computed_repo_db_url }}"
         repository_acs_is_enterprise: "{{ acs_is_enterprise }}"
         repository_acs_version: "{{ acs_play_repository_acs_version }}"
         repository_acs_artifact_name: "{{ acs_play_repository_acs_artifact_name }}"
@@ -537,9 +537,9 @@
         name: "../roles/search_enterprise"
       vars:
         java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
-        search_enterprise_repo_db_url: "{{ acs_play_repo_db_url }}"
-        search_enterprise_repo_db_name: "{{ acs_play_repo_db_name }}"
+        search_enterprise_repo_db_url: "{{ acs_play_computed_repo_db_url }}"
         search_enterprise_repo_db_username: "{{ acs_play_repo_db_username }}"
+        search_enterprise_repo_db_password: "{{ repo_db_password }}"
         search_enterprise_version: "{{ acs_play_search_enterprise_version }}"
         search_enterprise_zip_url: "{{ acs_play_search_enterprise_zip_url }}"
         search_enterprise_zip_checksum: "{{ acs_play_search_enterprise_zip_checksum }}"
@@ -687,7 +687,7 @@
         sync_jdbc_driver_version: "{{ acs_play_sync_jdbc_driver_version }}"
         sync_jdbc_driver_url: "{{ acs_play_sync_jdbc_driver_url }}"
         sync_jdbc_driver_checksum: "{{ acs_play_sync_jdbc_driver_checksum }}"
-        sync_db_url: "{{ acs_play_sync_db_url }}"
+        sync_db_url: "{{ acs_play_computed_sync_db_url }}"
         sync_db_driver: "{{ acs_play_sync_db_driver }}"
         sync_db_name: "{{ acs_play_sync_db_name }}"
         sync_db_username: "{{ acs_play_sync_db_username }}"

playbooks/facts.yml

@@ -11,6 +11,24 @@
       ansible.builtin.set_fact:
         hxi_enabled: "{{ groups.hxi | default([]) | length > 0 }}"
 
+    - name: Set facts related to hosts
+      ansible.builtin.set_fact:
+        db_host: >-
+          {{ groups['database']
+          | default([])
+          | map('extract', hostvars, ['ansible_default_ipv4', 'address'])
+          | first
+          | default('127.0.0.1') }}
+
+    - name: Set facts computed with some logic
+      ansible.builtin.set_fact:
+        acs_play_computed_repo_db_url: >-
+          {{ acs_play_repo_db_url if acs_play_repo_db_url else
+          'jdbc:postgresql://' + db_host + ':' + ports_cfg_postgres_sql | string + '/' + acs_play_repo_db_name }}
+        acs_play_computed_sync_db_url: >-
+          {{ acs_play_sync_db_url if acs_play_sync_db_url else
+          'jdbc:postgresql://' + db_host + ':' + ports_cfg_postgres_sql | string + '/' + acs_play_sync_db_name }}
+
     - name: Validate acs edition value
       ansible.builtin.assert:
         that:

playbooks/group_vars/all.yml

@@ -64,3 +64,5 @@ acs_play_community_repository_acs_artifact_name: alfresco-content-services-commu
 acs_play_community_repository_acs_repository: "{{ nexus_repository.releases }}"
 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"
+
+ports_cfg_postgres_sql: 5432

playbooks/group_vars/repository.yml

@@ -63,7 +63,7 @@ acs_play_port: >-
 global_properties:
   db:
     url: >-
-      {{ acs_play_repo_db_url if acs_play_repo_db_url else 'jdbc:postgresql://' + db_host + ':' + ports_cfg.postgres.sql | string + '/' + acs_play_repo_db_name }}
+      {{ acs_play_computed_repo_db_url }}
     driver: "{{ acs_play_repo_db_driver }}"
     username: "{{ acs_play_repo_db_username }}"
     password: "{{ repo_db_password }}"

playbooks/prerun-network-checks.yml

@@ -1,5 +1,9 @@
 ---
 # This playbook is used to run preliminary network checks for the hosts in the ACS deployment.
+- name: Include vars based on acs major version
+  ansible.builtin.import_playbook: include-vars.yml
+- name: Populate deployment configuration facts
+  ansible.builtin.import_playbook: facts.yml
 - name: Gather facts on all the hosts
   hosts: all:!external
   gather_facts: false
@@ -19,7 +23,7 @@
       ansible.builtin.include_tasks: "tasks/check_port.yml"
       vars:
         checked_host: "{{ db_host }}"
-        checked_port: "{{ ports_cfg.postgres.sql }}"
+        checked_port: "{{ ports_cfg_postgres_sql }}"
         delegate_target: "{{ groups.database | first }}"
       when: acs_play_repo_db_url == "" and groups.database | default([]) | length > 0
 
@@ -116,7 +120,7 @@
       ansible.builtin.include_tasks: "tasks/check_port.yml"
       vars:
         checked_host: "{{ db_host }}"
-        checked_port: "{{ ports_cfg.postgres.sql }}"
+        checked_port: "{{ ports_cfg_postgres_sql }}"
         delegate_target: "{{ groups.database | first }}"
       when: acs_play_repo_db_url == "" and groups.database | default([]) | length > 0
 

roles/common/defaults/main.yml

@@ -40,12 +40,6 @@ activemq_transport: >-
   | first
   | default('tcp') }}
 activemq_protocol: openwire
-db_host: >-
-  {{ groups['database']
-  | default([])
-  | map('extract', hostvars, ['ansible_default_ipv4', 'address'])
-  | first
-  | default('127.0.0.1') }}
 solr_host: >-
   {{ groups['search']
   | default([])
@@ -119,8 +113,6 @@ ports_cfg:
     http: 8080
     https: 8443
     shutdown: 8005
-  postgres:
-    sql: 5432
   transformers:
     tengine: 8090
     trouter: 8095

roles/repository/tasks/main.yml

@@ -514,12 +514,6 @@
         owner: root
         group: root
 
-- name: Wait-for-db
-  ansible.builtin.wait_for:
-    host: "{{ db_host }}"
-    port: "{{ ports_cfg.postgres.sql }}"
-  when: not repository_db_url | default(false)
-
 - name: Check if service restart is needed
   ansible.builtin.debug:
     msg: triggering service restart

roles/search_enterprise/defaults/main.yml

@@ -15,5 +15,5 @@ search_enterprise_zip_username: null
 search_enterprise_zip_password: null
 
 search_enterprise_repo_db_url: ""
-search_enterprise_repo_db_name: "alfresco"
 search_enterprise_repo_db_username: "alfresco"
+search_enterprise_repo_db_password: ""

roles/search_enterprise/meta/argument_specs.yml

@@ -23,13 +23,13 @@ argument_specs:
         required: false
       search_enterprise_repo_db_url:
         description: |
-          URL of the database to use for the Search Enterprise
+          URL of the database to use for the Search Enterprise Bulk Ingester
         required: false
-      search_enterprise_repo_db_name:
+      search_enterprise_repo_db_username:
         description: |
-          Name of the database to use for the Search Enterprise
+          Username to use to connect to the database for the Search Enterprise Bulk Ingester
         required: false
-      search_enterprise_repo_db_username:
+      search_enterprise_repo_db_password:
         description: |
-          Username to use to connect to the database for the Search Enterprise
+          Password to use to connect to the database for the Search Enterprise Bulk Ingester
         required: false