From 3a63c27f9d638ca6d267f5fce4e652b3e1232634 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Fri, 3 Jul 2020 20:06:02 +0200
Subject: [PATCH] Fix Ansible linting errors

---
 roles/opendistro/opendistro-elasticsearch/tasks/main.yml  | 8 ++++----
 .../opendistro-elasticsearch/tasks/security_actions.yml   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index 7abca273..7c5b3262 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - import_tasks: local_actions.yml
   when:
-    - generate_certs == true
+    - generate_certs
 
 - block:
 
@@ -69,7 +69,7 @@
     delay: 5
     tags: debug
     when:
-      - hostvars[inventory_hostname]['private_ip'] is not defined or hostvars[inventory_hostname]['private_ip'] == ""
+      - hostvars[inventory_hostname]['private_ip'] is not defined or not hostvars[inventory_hostname]['private_ip']
 
   - name: Wait for Elasticsearch API (Private IP)
     uri:
@@ -86,9 +86,9 @@
     delay: 5
     tags: debug
     when:
-      - hostvars[inventory_hostname]['private_ip'] is defined and  hostvars[inventory_hostname]['private_ip'] != ""
+      - hostvars[inventory_hostname]['private_ip'] is defined and  hostvars[inventory_hostname]['private_ip']
 
   - import_tasks: "RMRedHat.yml"
     when: ansible_os_family == "RedHat"
 
-  when: perform_installation == true
\ No newline at end of file
+  when: perform_installation
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
index a9fece85..95f366f4 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
@@ -86,7 +86,7 @@
     run_once: true
 
   - name: Hashing the custom admin password
-    shell: "{{ opendistro_sec_plugin_tools_path }}/hash.sh -p {{ opendistro_admin_password }}"
+    command: "{{ opendistro_sec_plugin_tools_path }}/hash.sh -p {{ opendistro_admin_password }}"
     register: opendistro_admin_password_hashed
     run_once: true
 
@@ -145,8 +145,8 @@
       return_content: yes
       timeout: 4
     when:
-      - opendistro_custom_user != ""
+      - opendistro_custom_user
 
   tags:
     - security
-  when: install.changed
\ No newline at end of file
+  when: install.changed