Do not pin on mysql-server as server name as mysql-community-server could also be used

This commit is contained in:
Sander Cornelissen 2016-12-19 17:38:35 +01:00
parent 786bde93fe
commit 7a2b76f455

View file

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