From 52536a314cac0e3d44f0a8f1f189f89fc2aa535f Mon Sep 17 00:00:00 2001
From: Vitaliy Kukharik <vitabaks@gmail.com>
Date: Sat, 28 Dec 2024 10:26:32 +0000
Subject: [PATCH] Update deploy_pgcluster.yml

---
 automation/deploy_pgcluster.yml | 34 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/automation/deploy_pgcluster.yml b/automation/deploy_pgcluster.yml
index ed2060d52..4625428fa 100644
--- a/automation/deploy_pgcluster.yml
+++ b/automation/deploy_pgcluster.yml
@@ -83,23 +83,6 @@
         - pgbackrest_auto_conf | default(true) | bool  # to be able to disable auto backup settings
       tags: always
 
-  roles:
-    # (optional) if 'ssh_public_keys' is defined
-    - role: authorized-keys
-      tags: ssh_public_keys
-
-    - role: pre-checks
-      vars:
-        minimal_ansible_version: 2.16.0
-        timescale_minimal_pg_version: 12 # if enable_timescale is defined
-      tags: always
-
-    - role: hostname
-
-    - role: tls_certificate/generate
-      when: tls_cert_generate|bool
-
-  tasks:
     - name: Clean dnf cache
       ansible.builtin.command: dnf clean all
       when:
@@ -207,6 +190,22 @@
       when: pre_deploy_command | default('') | length > 0
       tags: pre_deploy, pre_deploy_command
 
+  roles:
+    # (optional) if 'ssh_public_keys' is defined
+    - role: authorized-keys
+      tags: ssh_public_keys
+
+    - role: pre-checks
+      vars:
+        minimal_ansible_version: 2.16.0
+        timescale_minimal_pg_version: 12 # if enable_timescale is defined
+      tags: always
+
+    - role: hostname
+
+    - role: tls_certificate/generate
+      when: tls_cert_generate|bool
+
 - name: deploy_pgcluster.yml | Deploy etcd cluster
   ansible.builtin.import_playbook: etcd_cluster.yml
   when: not dcs_exists|bool and dcs_type == "etcd"
@@ -266,7 +265,6 @@
       when: firewall_enabled_at_boot|bool
       tags: firewall
 
-    - role: hostname
     - role: resolv_conf
     - role: etc_hosts
     - role: add-repository