lvm-lv: Fix role, make it usable by adding "lvm_lv_mountpoint"

[AnsibleRoles.git] / roles / mysql-server / tasks / main.yml

diff --git a/roles/mysql-server/tasks/main.yml b/roles/mysql-server/tasks/main.yml
index dff91e3722f79e1a810a0e89722aad79f9e1eae6..046e76ff80642373080bf9027b1ee133422ab1e9 100644 (file)
--- a/roles/mysql-server/tasks/main.yml
+++ b/roles/mysql-server/tasks/main.yml
@@ -1,63 +1,23 @@
 ---
 # mysql-server tasks
 
-- name: check if MySQL data already exists
+- name: create LVM LV and file system for MySQL data
   tags:
     - mysql
     - fs
-  shell: test -d /var/lib/mysql/mysql
-  ignore_errors: yes
-  register: mysql_server_installed
-  changed_when: false
-
-- name: setup LVM volume "mysql" for MySQL
-  tags:
-    - mysql
-    - partition
-    - lvm
-    - fs
-  lvol: >
-    lv=mysql
-    size=10g
-    vg={{ mysql_server_vg }}
-  when: mysql_server_vg != "" and mysql_server_installed.rc != 0
-
-- name: create ext4 filesystem on MySQL partition "mysql"
-  tags:
-    - mysql
-    - fs
-  filesystem: >
-    dev=/dev/{{ mysql_server_vg }}/mysql
-    fstype=ext4
-    opts="-L mysql"
-  when: mysql_server_vg != "" and mysql_server_installed.rc != 0
-
-- name: create mount point "/var/lib/mysql"
-  tags:
-    - mysql
-    - fs
-  file: >
-    path=/var/lib/mysql
-    state=directory
-  when: mysql_server_vg != "" and mysql_server_installed.rc != 0
-
-- name: configure and mount MySQL partition "mysql"
-  tags:
-    - mysql
-    - fs
-    - mount
-  mount: >
-    fstype=ext4
-    name=/var/lib/mysql
-    src=/dev/{{ mysql_server_vg }}/mysql
-    state=mounted
-    opts=rw,errors=remount-ro,noatime
-    passno=2
-  when: mysql_server_vg != "" and mysql_server_installed.rc != 0
+  include_role:
+    name: lvm-lv
+  vars:
+    lvm_vg: "{{ mysql_server_vg }}"
+    lvm_lv_name: "{{ mysql_server_lv_name }}"
+    lvm_lv_size: "{{ mysql_server_lv_size }}"
+    lvm_lv_mountpoint: "/var/lib/mysql"
+  when: mysql_server_vg != "" and mysql_server_lv_name != ""
 
 - name: install MySQL packages for client and server
   tags:
     - mysql
+    - mysqld
     - packages
   apt: >
     state=installed
@@ -68,18 +28,20 @@
     - mysqltuner
     - python-mysqldb
 
-- name: ensure service "mysql" is enabled and running
+- name: ensure service "mysql" is enabled and started
   tags:
     - services
     - mysql
+    - mysqld
   service: >
     enabled=yes
     name=mysql
-    state=running
+    state=started
 
 - name: setup MySQL "ansible" account
   tags:
     - mysql
+    - mysqld
     - mysql-users
   mysql_user: >
     login_user={{ mysql_server_ansible_user }}
@@ -94,6 +56,7 @@
 - name: setup MySQL "root" account
   tags:
     - mysql
+    - mysqld
     - mysql-users
   mysql_user: >
     login_user={{ mysql_server_ansible_user }}
@@ -107,6 +70,7 @@
 - name: Remove unwanted MySQL "root" accounts (1/2)
   tags:
     - mysql
+    - mysqld
     - mysql-users
   mysql_user: >
     login_user={{ mysql_server_ansible_user }}
@@ -122,6 +86,7 @@
 - name: Remove unwanted MySQL "root" accounts (2/2)
   tags:
     - mysql
+    - mysqld
     - mysql-users
   mysql_user: >
     login_user={{ mysql_server_ansible_user }}