From b2596aad2ab585f9b361907194157a4cf6e489f3 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 13 Sep 2018 18:32:19 +0200
Subject: [PATCH] mysql: add a variable to prevent mysql from restarting

---
 CHANGELOG.md                   | 1 +
 mysql-oracle/README.md         | 1 +
 mysql-oracle/defaults/main.yml | 2 ++
 mysql-oracle/handlers/main.yml | 5 +++++
 mysql-oracle/tasks/main.yml    | 3 +++
 mysql-oracle/tasks/tmpdir.yml  | 2 +-
 mysql/defaults/main.yml        | 2 ++
 mysql/handlers/main.yml        | 5 +++++
 mysql/tasks/main.yml           | 3 +++
 mysql/tasks/tmpdir.yml         | 2 +-
 10 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b46629bc..3ceda4a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The **patch** part changes incrementally at each release.
 * etc-git: manage a cron job to monitor uncommited changes in /etc/.git (default: `True`)
 * evolinux-base: better shell history
 * evolinux-users: add user to /etc/aliases
+* mysql: add a variable to prevent mysql from restarting
 * webapps/evoadmin-web: add users to /etc/aliases
 
 ### Changed
diff --git a/mysql-oracle/README.md b/mysql-oracle/README.md
index 5d09720e..011e1ac3 100644
--- a/mysql-oracle/README.md
+++ b/mysql-oracle/README.md
@@ -28,6 +28,7 @@ Tasks are extracted in several files, included in `tasks/main.yml` :
 * `general_scripts_dir`: general directory for scripts installation (default: `/usr/local/bin`).
 * `mysql_scripts_dir`: email address to send Log2mail messages to (default: `general_scripts_dir`).
 * `mysql_force_new_nrpe_password` : change the password for NRPE even if it exists already (default: `False`).
+* `mysql_restart_if_needed` : should the restart handler be executed (default: `True`)
 
 NB : changing the _datadir_ location can be done multiple times, as long as it is not restored to the default initial location, (because a symlink is created and can't be switched back, yet).
 
diff --git a/mysql-oracle/defaults/main.yml b/mysql-oracle/defaults/main.yml
index e37f0680..d9724ca2 100644
--- a/mysql-oracle/defaults/main.yml
+++ b/mysql-oracle/defaults/main.yml
@@ -22,3 +22,5 @@ mysql_cron_mysqltuner: True
 mysql_cron_mysqltuner_frequency: monthly
 
 mysql_force_new_nrpe_password: False
+
+mysql_restart_if_needed: True
diff --git a/mysql-oracle/handlers/main.yml b/mysql-oracle/handlers/main.yml
index 5a82afae..c89d562a 100644
--- a/mysql-oracle/handlers/main.yml
+++ b/mysql-oracle/handlers/main.yml
@@ -14,6 +14,11 @@
     name: mysql
     state: restarted
 
+- name: restart mysql (noop)
+  meta: noop
+  failed_when: False
+  changed_when: False
+
 - name: reload systemd
   systemd:
     name: mysql
diff --git a/mysql-oracle/tasks/main.yml b/mysql-oracle/tasks/main.yml
index 273960a9..2e2f09bf 100644
--- a/mysql-oracle/tasks/main.yml
+++ b/mysql-oracle/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+- set_fact:
+    mysql_restart_handler_name: "{{ mysql_restart_if_needed | bool | ternary('restart mysql', 'restart mysql (noop)') }}"
+
 - include: packages.yml
 
 - include: users.yml
diff --git a/mysql-oracle/tasks/tmpdir.yml b/mysql-oracle/tasks/tmpdir.yml
index ca560077..8d518160 100644
--- a/mysql-oracle/tasks/tmpdir.yml
+++ b/mysql-oracle/tasks/tmpdir.yml
@@ -17,7 +17,7 @@
       section: mysqld
       option: tmpdir
       value: "{{ mysql_custom_tmpdir }}"
-    notify: restart mysql
+    notify: "{{ mysql_restart_handler_name }}"
     tags:
       - mysql
   when: mysql_custom_tmpdir != ''
diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml
index d93f7270..52bf8b07 100644
--- a/mysql/defaults/main.yml
+++ b/mysql/defaults/main.yml
@@ -40,3 +40,5 @@ mysql_force_new_nrpe_password: False
 
 mysql_evolinux_defaults_file: z-evolinux-defaults.cnf
 mysql_evolinux_custom_file: zzz-evolinux-custom.cnf
+
+mysql_restart_if_needed: True
diff --git a/mysql/handlers/main.yml b/mysql/handlers/main.yml
index 32c630af..2ea13151 100644
--- a/mysql/handlers/main.yml
+++ b/mysql/handlers/main.yml
@@ -14,6 +14,11 @@
     name: mysql
     state: restarted
 
+- name: restart mysql (noop)
+  meta: noop
+  failed_when: False
+  changed_when: False
+
 - name: reload systemd
   systemd:
     name: mysql
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index dd9c2e99..9f9c07f4 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+- set_fact:
+    mysql_restart_handler_name: "{{ mysql_restart_if_needed | bool | ternary('restart mysql', 'restart mysql (noop)') }}"
+
 - include: packages_stretch.yml
   when: ansible_distribution_major_version | version_compare('9', '>=')
 
diff --git a/mysql/tasks/tmpdir.yml b/mysql/tasks/tmpdir.yml
index 35942612..e2c13dc5 100644
--- a/mysql/tasks/tmpdir.yml
+++ b/mysql/tasks/tmpdir.yml
@@ -17,7 +17,7 @@
       section: mysqld
       option: tmpdir
       value: "{{ mysql_custom_tmpdir }}"
-    notify: restart mysql
+    notify: "{{ mysql_restart_handler_name }}"
     tags:
       - mysql
   when: mysql_custom_tmpdir != ''