simplify vars

Author: Colin Hoglund

README.md

@@ -68,18 +68,14 @@ The MySQL users and their privileges. A user has the values `name`, `host` (defa
 
 (OS-specific, RedHat/CentOS defaults listed here) Packages to be installed. In some situations, you may need to add additional packages, like `mysql-devel`.
 
-    mysql_apt_repo_enable: false
+    mysql_apt_repo_version: 5.7
 
 Use repo.mysql.com to install mysql packages. Used only for Debian based systems. Disabled by default.
 
     mysql_apt_repo_release: "{{ansible_distribution_release}}"
 
 Override this if you want to install older versions of mysql on newer OS releases.
 
-    mysql_apt_repo_sources: [mysql-5.7]
-
-A list of sources to add to _/etc/apt/sources.list.d/_. Go to http://repo.mysql.com/apt/ubuntu/dists/trusty/ to see some examples.
-
     mysql_enablerepo: ""
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.

tasks/setup-Debian.yml

@@ -5,14 +5,14 @@
 
 - name: Add repo.mysql.com apt key
   apt_key: url=http://repo.mysql.com/RPM-GPG-KEY-mysql
-  when: mysql_apt_repo_enable
+  when: mysql_apt_repo_version is defined
 
 - name: Add repo.mysql.com apt repo
   apt_repository:
-    repo: "deb http://repo.mysql.com/apt/{{ansible_distribution|lower}}/ {{mysql_apt_repo_release}} {{item}}"
-  with_items: "{{mysql_apt_repo_sources}}"
-  when: mysql_apt_repo_enable
+    repo: "deb http://repo.mysql.com/apt/{{ansible_distribution|lower}}/ {{mysql_apt_repo_release}} mysql-{{mysql_apt_repo_version}}"
+  when: mysql_apt_repo_version is defined
 
+# This ensures that packages from repo.mysql.com take precedence over OS provided packages
 - name: Update apt to prefer repo.mysql.com packages
   copy:
     content: |
@@ -23,7 +23,7 @@
     owner: root
     group: root
     mode: 0644
-  when: mysql_apt_repo_enable
+  when: mysql_apt_repo_version is defined
 
 - name: Update apt cache if MySQL is not yet installed.
   apt: update_cache=yes