From 478beab8565abd5ed44b8c1e0d73eb544679d184 Mon Sep 17 00:00:00 2001
From: Mathieu Trossevin <mtrossevin+git@evolix.fr>
Date: Fri, 19 Jun 2020 12:28:23 +0200
Subject: [PATCH] [Cleanup] mysql-oracle (name + comparison with empty string)

---
 mysql-oracle/tasks/config.yml   | 3 ++-
 mysql-oracle/tasks/datadir.yml  | 4 ++--
 mysql-oracle/tasks/main.yml     | 3 ++-
 mysql-oracle/tasks/packages.yml | 3 ++-
 mysql-oracle/tasks/tmpdir.yml   | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mysql-oracle/tasks/config.yml b/mysql-oracle/tasks/config.yml
index 16590a59..ebd861f3 100644
--- a/mysql-oracle/tasks/config.yml
+++ b/mysql-oracle/tasks/config.yml
@@ -1,6 +1,7 @@
 ---
 
-- set_fact:
+- name: "Define the mysql config directory"
+  set_fact:
     mysql_config_directory: "/etc/mysql/mysql.conf.d"
 
 - name: "Copy MySQL defaults config file"
diff --git a/mysql-oracle/tasks/datadir.yml b/mysql-oracle/tasks/datadir.yml
index 28beb1ed..ee4e7bcf 100644
--- a/mysql-oracle/tasks/datadir.yml
+++ b/mysql-oracle/tasks/datadir.yml
@@ -14,7 +14,7 @@
     register: mysql_current_real_datadir_test
   tags:
     - mysql
-  when: mysql_custom_datadir != ''
+  when: mysql_custom_datadir
 
 - block:
   - name: MySQL is stopped
@@ -40,6 +40,6 @@
   tags:
     - mysql
   when:
-    - mysql_custom_datadir != ''
+    - mysql_custom_datadir
     - mysql_custom_datadir != mysql_current_real_datadir_test.stdout
     - not mysql_custom_datadir_test.stat.exists
diff --git a/mysql-oracle/tasks/main.yml b/mysql-oracle/tasks/main.yml
index 2e2f09bf..b0b708fa 100644
--- a/mysql-oracle/tasks/main.yml
+++ b/mysql-oracle/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 
-- set_fact:
+- name: 'Define which handler will be called to "restart" mysql'
+  set_fact:
     mysql_restart_handler_name: "{{ mysql_restart_if_needed | bool | ternary('restart mysql', 'restart mysql (noop)') }}"
 
 - include: packages.yml
diff --git a/mysql-oracle/tasks/packages.yml b/mysql-oracle/tasks/packages.yml
index af1a0460..c16967d1 100644
--- a/mysql-oracle/tasks/packages.yml
+++ b/mysql-oracle/tasks/packages.yml
@@ -1,6 +1,7 @@
 ---
 
-- set_fact:
+- name: "Define which configuration package will be installed"
+  set_fact:
     mysql_apt_config_package: mysql-apt-config_0.8.9-1_all.deb
 
 - name: Set default MySQL version to 5.7
diff --git a/mysql-oracle/tasks/tmpdir.yml b/mysql-oracle/tasks/tmpdir.yml
index 8d518160..2fce8a2f 100644
--- a/mysql-oracle/tasks/tmpdir.yml
+++ b/mysql-oracle/tasks/tmpdir.yml
@@ -20,4 +20,4 @@
     notify: "{{ mysql_restart_handler_name }}"
     tags:
       - mysql
-  when: mysql_custom_tmpdir != ''
+  when: mysql_custom_tmpdir