From af0e2f0756ff004acb44ec7fb00b9f3c20244f9d Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Mon, 5 Aug 2019 15:05:49 +0200
Subject: [PATCH] Add copy block to import node's certificate with custom CA
 name

---
 .../tasks/xpack_security.yml                    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/xpack_security.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/xpack_security.yml
index 8fabf6eb..890db757 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/xpack_security.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/xpack_security.yml
@@ -108,7 +108,6 @@
   when: 
     - node_certs_generator
     
-
 - name: Unzip generated certs.zip
   unarchive:
     src: "{{master_certs_destination}}/certs.zip"
@@ -139,10 +138,24 @@
   copy:
     src: "{{item}}"
     dest: "{{node_certs_destination}}/"
-  with_items: 
+  with_items:
     - "{{master_certs_destination}}/{{elasticsearch_node_name}}/{{ elasticsearch_node_name }}.key" 
     - "{{master_certs_destination}}/{{elasticsearch_node_name}}/{{ elasticsearch_node_name }}.crt"
     - "{{master_certs_destination}}/ca/ca.crt"
+  when:
+    - generate_CA
+  tags: xpack-security
+
+- name: Copying node's certificate from master (Custom CA)
+  copy:
+    src: "{{item}}"
+    dest: "{{node_certs_destination}}/"
+  with_items: 
+    - "{{master_certs_destination}}/{{elasticsearch_node_name}}/{{ elasticsearch_node_name }}.key" 
+    - "{{master_certs_destination}}/{{elasticsearch_node_name}}/{{ elasticsearch_node_name }}.crt"
+    - "{{master_certs_destination}}/ca/{{ca_cert_name}}"
+  when:
+    - not generate_CA
   tags: xpack-security
 
 - name: Set elasticsearch bootstrap password