From b81ef36f92a48c4fda5488322b0b9c6a78366ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= <jlecour@evolix.fr>
Date: Wed, 14 Mar 2018 09:33:14 +0100
Subject: [PATCH] mysql: remount /usr (if needed) before creating scripts
 directory

---
 CHANGELOG.md                 | 1 +
 mysql-oracle/tasks/utils.yml | 6 +++++-
 mysql/tasks/utils.yml        | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0b5c392..5a0227fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 * nagios-nrpe: add "check_open_files" plugin
 * nagios-nrpe: mark plugins as executable
 * mysql-oracle: new role to install MySQL 5.7 with Oracle packages
+* mysql: remount /usr before creating scripts directory
 * packweb-apache: choose mysql variant (default: `debian`)
 * haproxy: install Munin plugins
 * proftpd: use proftpd_accounts list for manage ftp accounts
diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml
index 4e0e4aa9..b0b3284b 100644
--- a/mysql-oracle/tasks/utils.yml
+++ b/mysql-oracle/tasks/utils.yml
@@ -1,5 +1,9 @@
 ---
 
+- include_role:
+    name: remount-usr
+  when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
+
 - name: Scripts directory exists
   file:
     dest: "{{ mysql_scripts_dir or general_scripts_dir | mandatory }}"
@@ -35,7 +39,7 @@
   - libdbd-mysql-perl
   - libdbi-perl
   - libterm-readkey-perl
-  - libtime-hires-perl 
+  - libtime-hires-perl
   tags:
     - packages
     - mytop
diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml
index a6fc307c..499afaa8 100644
--- a/mysql/tasks/utils.yml
+++ b/mysql/tasks/utils.yml
@@ -1,5 +1,9 @@
 ---
 
+- include_role:
+    name: remount-usr
+  when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
+
 - name: Ensure scripts directory exists
   file:
     dest: "{{ mysql_scripts_dir or general_scripts_dir | mandatory }}"
@@ -74,7 +78,7 @@
 # automatic optimizations
 
 - include_role:
-    name: remount-usr  
+    name: remount-usr
   when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
 
 - name: Optimize script for MySQL