From 37ef790d57608390d8294c7a72f35058f9e6fec8 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 23 May 2017 15:11:11 +0200
Subject: [PATCH] mysql: remount /usr if needed

---
 mysql/tasks/remount_usr_rw.yml | 13 +++++++++++++
 mysql/tasks/utils.yml          | 21 +++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 mysql/tasks/remount_usr_rw.yml

diff --git a/mysql/tasks/remount_usr_rw.yml b/mysql/tasks/remount_usr_rw.yml
new file mode 100644
index 00000000..a62d86d6
--- /dev/null
+++ b/mysql/tasks/remount_usr_rw.yml
@@ -0,0 +1,13 @@
+---
+- name: Get mount options for partitions
+  shell: "mount | grep 'on /usr type'"
+  args:
+    warn: no
+  register: mount
+  changed_when: False
+  failed_when: False
+  when: not ansible_check_mode
+
+- name: Remount /usr if it is a partition and it is not mounted in rw
+  command: "mount -o remount,rw /usr"
+  when: mount.rc == 0 and not mount.stdout_lines.0 | search("rw")
diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml
index f0c2b386..58faeee4 100644
--- a/mysql/tasks/utils.yml
+++ b/mysql/tasks/utils.yml
@@ -30,6 +30,9 @@
 
 # mysqltuner
 
+- include: remount_usr_rw.yml
+  when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
+
 - name: Install mysqltuner
   copy:
     src: mysqltuner.pl
@@ -47,6 +50,9 @@
 
 # automatic optimizations
 
+- include: remount_usr_rw.yml
+  when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
+
 - name: Optimize script for MySQL
   copy:
     src: mysql-optimize.sh
@@ -82,12 +88,8 @@
 
 # my-add.sh
 
-- name: Install apg
-  apt:
-    name: apg
-  tags:
-    - mysql
-    - packages
+- include: remount_usr_rw.yml
+  when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
 
 - name: Ensure /usr/share/scripts exists
   file:
@@ -104,3 +106,10 @@
     mode: "0700"
   tags:
     - mysql
+
+- name: Install apg
+  apt:
+    name: apg
+  tags:
+    - mysql
+    - packages