gnuviech/gvasalt
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add MySQL patch for bug in Salt version 3000

Browse source
This commit is contained in:
Jan Dittberner 2020-03-04 20:54:45 +01:00
parent 288acee379
commit 7e246ec1a0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
states/gnuviechadmin/gvamysql.sls
View file

@ -3,9 +3,12 @@
{% set mysql_admin_user = salt['pillar.get']('gnuviechadmin:{}:mysql_admin_user'.format(gvaappname), 'gvamysql') %} {% set mysql_admin_user = salt['pillar.get']('gnuviechadmin:{}:mysql_admin_user'.format(gvaappname), 'gvamysql') %}
{% set mysql_admin_password = salt['pillar.get']('gnuviechadmin:{}:mysql_admin_password'.format(gvaappname)) %} {% set mysql_admin_password = salt['pillar.get']('gnuviechadmin:{}:mysql_admin_password'.format(gvaappname)) %}
{% from 'gnuviechadmin/gvaapp_macros.sls' import create_celery_worker with context %} {% from 'gnuviechadmin/gvaapp_macros.sls' import create_celery_worker with context %}
# FIXME: this is broken due to https://github.com/saltstack/salt/issues/56124
# patches.mysql is needed to be run on the minion before usage with Salt 3000
include: include:
- python.pipenv - python.pipenv
- python.virtualenv - python.virtualenv
- patches.mysql
- mariadb-server - mariadb-server
{{ create_celery_worker(gvaappname, purpose) }} {{ create_celery_worker(gvaappname, purpose) }}
@ -20,8 +23,6 @@ include:
python3-mysqldb: python3-mysqldb:
pkg.installed pkg.installed
# FIXME: this is broken due to https://github.com/saltstack/salt/issues/56124
# require salt-call state.sls patch.mysql to be run on the minion before usage
gvamysql-mysql-user: gvamysql-mysql-user:
mysql_user.present: mysql_user.present:
- name: {{ mysql_admin_user }} - name: {{ mysql_admin_user }}