[feat] Add dependence on mysql state to fleet state

This commit is contained in:
William Wernert
2020-04-17 20:57:59 -04:00
parent 068672ea12
commit fcbd22318a

View File

@@ -21,6 +21,9 @@
# hostname: {{ grains.host }} # hostname: {{ grains.host }}
#{% endif %} #{% endif %}
include:
- mysql
# Fleet Setup # Fleet Setup
fleetcdir: fleetcdir:
file.directory: file.directory:
@@ -79,6 +82,7 @@ osquerypackageswebpage:
- source: salt://fleet/files/dedicated-index.html - source: salt://fleet/files/dedicated-index.html
- template: jinja - template: jinja
fleetdb: fleetdb:
mysql_database.present: mysql_database.present:
- name: fleet - name: fleet
@@ -86,6 +90,8 @@ fleetdb:
- connection_port: 3306 - connection_port: 3306
- connection_user: root - connection_user: root
- connection_pass: {{ MYSQLPASS }} - connection_pass: {{ MYSQLPASS }}
- require:
- sls: mysql
fleetdbuser: fleetdbuser:
mysql_user.present: mysql_user.present:
@@ -95,6 +101,8 @@ fleetdbuser:
- connection_port: 3306 - connection_port: 3306
- connection_user: root - connection_user: root
- connection_pass: {{ MYSQLPASS }} - connection_pass: {{ MYSQLPASS }}
- require:
- fleetdb
fleetdbpriv: fleetdbpriv:
mysql_grants.present: mysql_grants.present:
@@ -106,7 +114,8 @@ fleetdbpriv:
- connection_port: 3306 - connection_port: 3306
- connection_user: root - connection_user: root
- connection_pass: {{ MYSQLPASS }} - connection_pass: {{ MYSQLPASS }}
- require:
- fleetdb
{% if FLEETPASS == None or FLEETJWT == None %} {% if FLEETPASS == None or FLEETJWT == None %}