@@ -20,16 +20,16 @@ include:
2020{% if ' debconf_root_password' in mysql % }
2121{% set debconf_root_password = mysql.debconf_root_password % }
2222{% set debconf_root_password_again = mysql.debconf_root_password_again % }
23- {% elif mysql.server .startswith(' percona-server-server' ) % }
24- {% if mysql.server < ' percona-server-server-5.7' % }{# 5.5 and 5.6 uses the same name... #}
23+ {% elif mysql.serverpkg .startswith(' percona-server-server' ) % }
24+ {% if mysql.serverpkg < ' percona-server-server-5.7' % }{# 5.5 and 5.6 uses the same name... #}
2525{% set debconf_root_password = ' percona-server-server/root_password' % }
2626{% set debconf_root_password_again = ' percona-server-server/root_password_again' % }
27- {% elif ' 5.7' in mysql.server % }{# 5.7 changed option name... #}
27+ {% elif ' 5.7' in mysql.serverpkg % }{# 5.7 changed option name... #}
2828{% set debconf_root_password = ' percona-server-server-5.7/root-pass' % }
2929{% set debconf_root_password_again = ' percona-server-server-5.7/re-root-pass' % }
3030{% else % }{# attempt to support future version? #}
31- {% set debconf_root_password = mysql.server + ' /root-pass' % }
32- {% set debconf_root_password_again = mysql.server + ' /re-root-pass' % }
31+ {% set debconf_root_password = mysql.serverpkg + ' /root-pass' % }
32+ {% set debconf_root_password_again = mysql.serverpkg + ' /re-root-pass' % }
3333{% endif % }
3434{% else % }
3535{% if salt[' grains.get' ](' osmajorrelease' )| int < 9 or not salt[' grains.get' ](' os' )| lower == ' debian' % }
@@ -245,4 +245,4 @@ mysql_additional_config:
245245 - source: salt:// {{ tpldir }}/ files/ usr- my.cnf
246246 - create: False
247247 - watch_in:
248- - service: mysqld- service- running
248+ - service: mysqld- service- running
0 commit comments