Merge pull request #60 from neuhalje/master

Add Fedora 21 and a mysql.disabled state

mysql/defaults.yaml

@@ -126,6 +126,24 @@ RedHat:
         port: 3306
         bind_address: 127.0.0.1
         symbolic_links: 0
+Fedora:
+  server: mariadb-server
+  client: mariadb
+  service: mariadb
+  python: MySQL-python
+  config:
+    file: /etc/my.cnf.d/server.cnf
+    sections:
+      mysqld_safe:
+        log_error: /var/log/mysqld.log
+        pid_file: /var/run/mysqld/mysqld.pid
+      mysqld:
+        datadir: /var/lib/mysql
+        socket: /var/lib/mysql/mysql.sock
+        user: mysql
+        port: 3306
+        bind_address: 127.0.0.1
+        symbolic_links: 0
 Amazon:
   server: mysql-server
   client: mysql

mysql/disabled.sls

@@ -0,0 +1,7 @@
+{% from "mysql/defaults.yaml" import rawmap with context %}
+{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %}
+
+mysql:
+  service.dead:
+      - name: {{ mysql.service }}
+      - enable: False