From 8caca4c711d6fa08f502279ded457fdf518d20cf Mon Sep 17 00:00:00 2001
From: Patrick Marchand <pmarchand@evolix.ca>
Date: Tue, 23 Jun 2020 11:07:55 -0400
Subject: [PATCH] Split jail port retrival tasks into their own file

This makes it easier to manage the dependency of the other tasks
on this variable. I removed the tags on those tasks so they would not
be excluded.
---
 evobackup-client/tasks/jail.yml           | 16 ----------------
 evobackup-client/tasks/jail_port.yml      | 11 +++++++++++
 evobackup-client/tasks/open_ssh_ports.yml |  3 +++
 evobackup-client/tasks/upload_scripts.yml |  6 +++---
 evobackup-client/tasks/verify_ssh.yml     |  3 +++
 5 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 evobackup-client/tasks/jail_port.yml

diff --git a/evobackup-client/tasks/jail.yml b/evobackup-client/tasks/jail.yml
index fbb6080c..8218fd35 100644
--- a/evobackup-client/tasks/jail.yml
+++ b/evobackup-client/tasks/jail.yml
@@ -39,19 +39,3 @@
   tags:
     - evobackup_client
     - evobackup_client_jail
-
-- name: 'get jail port'
-  command: "bkctld port {{ evolinux_hostname }}"
-  become: true
-  register: bkctld_port
-  delegate_to: "{{ evobackup_client__hosts[0].ip }}"
-  tags:
-    - evobackup_client
-    - evobackup_client_jail
-
-- name: 'register jail port'
-  set_fact:
-    evobackup_ssh_port={{ bkctld_port.stdout }}
-  tags:
-    - evobackup_client
-    - evobackup_client_jail
diff --git a/evobackup-client/tasks/jail_port.yml b/evobackup-client/tasks/jail_port.yml
new file mode 100644
index 00000000..16ebdea9
--- /dev/null
+++ b/evobackup-client/tasks/jail_port.yml
@@ -0,0 +1,11 @@
+---
+
+- name: 'get jail port'
+  command: "bkctld port {{ evolinux_hostname }}"
+  become: true
+  register: bkctld_port
+  delegate_to: "{{ evobackup_client__hosts[0].ip }}"
+
+- name: 'register jail port'
+  set_fact:
+    evobackup_ssh_port={{ bkctld_port.stdout }}
diff --git a/evobackup-client/tasks/open_ssh_ports.yml b/evobackup-client/tasks/open_ssh_ports.yml
index be96c161..31ce3862 100644
--- a/evobackup-client/tasks/open_ssh_ports.yml
+++ b/evobackup-client/tasks/open_ssh_ports.yml
@@ -8,6 +8,9 @@
     - evobackup_client
     - evobackup_client_backup_firewall
 
+- include: "jail_port.yml"
+  when: evobackup_ssh_port = ''
+
 - name: Add backup SSH port in /etc/default/minifirewall
   blockinfile:
     dest: /etc/default/minifirewall
diff --git a/evobackup-client/tasks/upload_scripts.yml b/evobackup-client/tasks/upload_scripts.yml
index 8d698519..0502118c 100644
--- a/evobackup-client/tasks/upload_scripts.yml
+++ b/evobackup-client/tasks/upload_scripts.yml
@@ -1,5 +1,8 @@
 ---
 
+- include: "jail_port.yml"
+  when: evobackup_ssh_port = ''
+
 - name: Upload evobackup script
   template:
     src: "{{ item }}"
@@ -11,6 +14,3 @@
     - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ host_group }}.sh.j2"
     - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.sh.j2"
     - "zzz_evobackup.default.sh.j2"
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_scripts
diff --git a/evobackup-client/tasks/verify_ssh.yml b/evobackup-client/tasks/verify_ssh.yml
index 4e968197..2d097a87 100644
--- a/evobackup-client/tasks/verify_ssh.yml
+++ b/evobackup-client/tasks/verify_ssh.yml
@@ -1,5 +1,8 @@
 ---
 
+- include: "jail_port.yml"
+  when: evobackup_ssh_port = ''
+
 - name: Verify evolix backup servers
   known_hosts:
     path: /root/.ssh/known_hosts