saltstack-formulas/mysql-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/mysql-formula.git synced 2025-04-16 17:50:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #169 from gtmanfred/master

Browse source 
osmajorrelease is an int now
This commit is contained in:
Daniel Wallace 2017-09-22 16:17:12 -06:00 • committed by GitHub
commit 4ccb8a1f57
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql/defaults.yaml
View file

@ -92,7 +92,7 @@ Debian:
!includedir /etc/mysql/conf.d/
CentOS:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{%- if salt['grains.get']('osmajorrelease') in ['7'] %}
{%- if salt['grains.get']('osmajorrelease')|int in [7] %}
{% set mysql_engine = 'mariadb' %}
{% set mysql_service = 'mariadb' %}
{%- else %}
@ -123,7 +123,7 @@ CentOS:
symbolic_links: 0
RedHat:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{%- if salt['grains.get']('osmajorrelease') in ['7'] %}
{%- if salt['grains.get']('osmajorrelease')|int in [7] %}
{% set mysql_engine = 'mariadb' %}
{% set mysql_service = 'mariadb' %}
{%- else %}

6
mysql/repo.sls
View file

@ -8,11 +8,11 @@ include:
# TODO: Add Debian and Suse systems.
# TODO: Allow user to specify MySQL version and alter yum repo file accordingly.
{% if grains['os_family'] == 'RedHat' %}
{% if grains['osmajorrelease'][0] == '5' %}
{% if grains['osmajorrelease']|int == 5 %}
{% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %}
{% elif grains['osmajorrelease'][0] == '6' %}
{% elif grains['osmajorrelease']|int == 6 %}
{% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el6.rpm" %}
{% elif grains['osmajorrelease'][0] == '7' %}
{% elif grains['osmajorrelease']|int == 7 %}
{% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el7.rpm" %}
{% endif %}
{% endif %}