Merge pull request #146 from S-Wilhelm/master

Fix server.sls version check on Debian
This commit is contained in:
Forrest 2016-10-10 14:52:01 -07:00 committed by GitHub
commit 5a50911bc5

View file

@ -89,7 +89,7 @@ mysqld-packages:
- debconf: mysql_debconf
{% endif %}
{% if os_family == 'RedHat' or 'Suse' and mysql.version >= 5.7 %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version >= 5.7 %}
# Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
mysql_initialize:
cmd.run:
@ -106,7 +106,7 @@ mysqld:
- enable: True
- require:
- pkg: {{ mysql.server }}
{% if os_family == 'RedHat' or 'Suse' and mysql.version >= 5.7 %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version >= 5.7 %}
- cmd: mysql_initialize
{% endif %}
- watch: