From 361126b8b0747e1fa8320f186fff726acbbb982c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Jan 2015 09:23:33 -0600
Subject: [PATCH] Issue #9: Allow mysql_packages to be overridden.

---
 defaults/main.yml | 7 +++++++
 tasks/main.yml    | 8 ++++++++
 vars/Debian.yml   | 2 +-
 vars/RedHat.yml   | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4a7a9cb..f06535c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,6 +9,13 @@ mysql_enabled_on_startup: yes
 # for RedHat systems (and derivatives).
 mysql_enablerepo: ""
 
+# Define a custom list of packages to install; if none provided, the default
+# package list from vars/[OS-family].yml will be used.
+# mysql_packages:
+#   - mysql
+#   - mysql-server
+#   - MySQL-python
+
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
diff --git a/tasks/main.yml b/tasks/main.yml
index 775df11..271393a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,13 +1,21 @@
 ---
+# Include variables and define needed variables.
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Define mysql_packages.
+  set_fact:
+    mysql_packages: "{{ __mysql_packages | list }}"
+  when: mysql_packages is not defined
+
+# Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+# Configure MySQL.
 - include: configure.yml
 - include: secure-installation.yml
 - include: databases.yml
diff --git a/vars/Debian.yml b/vars/Debian.yml
index db19a43..0a04ce0 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,7 +1,7 @@
 ---
 mysql_daemon: mysql
 mysql_config_file: /etc/mysql/my.cnf
-mysql_packages:
+__mysql_packages:
   - mysql-common
   - mysql-server
   - python-mysqldb
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index aeb31cf..055839c 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,7 +1,7 @@
 ---
 mysql_daemon: mysqld
 mysql_config_file: /etc/my.cnf
-mysql_packages:
+__mysql_packages:
   - mysql
   - mysql-server
   - MySQL-python