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

Merge pull request #256 from GMAzrael/GMAzrael-patch-1

Browse source 
fix(server.sls): fix dictionary startswith
This commit is contained in:
N 2020-12-08 14:52:00 +00:00 • committed by GitHub
commit d5e44c90bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql/server.sls
View file

@ -20,16 +20,16 @@ include:
{% if 'debconf_root_password' in mysql %}
{% set debconf_root_password = mysql.debconf_root_password %}
{% set debconf_root_password_again = mysql.debconf_root_password_again %}
{% elif mysql.server.startswith('percona-server-server') %}
{% if mysql.server < 'percona-server-server-5.7' %}{# 5.5 and 5.6 uses the same name... #}
{% elif mysql.serverpkg.startswith('percona-server-server') %}
{% if mysql.serverpkg < 'percona-server-server-5.7' %}{# 5.5 and 5.6 uses the same name... #}
{% set debconf_root_password = 'percona-server-server/root_password' %}
{% set debconf_root_password_again = 'percona-server-server/root_password_again' %}
{% elif '5.7' in mysql.server %}{# 5.7 changed option name... #}
{% elif '5.7' in mysql.serverpkg %}{# 5.7 changed option name... #}
{% set debconf_root_password = 'percona-server-server-5.7/root-pass' %}
{% set debconf_root_password_again = 'percona-server-server-5.7/re-root-pass' %}
{% else %}{# attempt to support future version? #}
{% set debconf_root_password = mysql.server + '/root-pass' %}
{% set debconf_root_password_again = mysql.server + '/re-root-pass' %}
{% set debconf_root_password = mysql.serverpkg + '/root-pass' %}
{% set debconf_root_password_again = mysql.serverpkg + '/re-root-pass' %}
{% endif %}
{% else %}
{% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %}
@ -245,4 +245,4 @@ mysql_additional_config:
- source: salt://{{ tpldir }}/files/usr-my.cnf
- create: False
- watch_in:
- service: mysqld-service-running
- service: mysqld-service-running