From fcbd22318af460ec7aed41b8a9be9dbc851c277c Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Fri, 17 Apr 2020 20:57:59 -0400
Subject: [PATCH] [feat] Add dependence on mysql state to fleet state

---
 salt/fleet/init.sls | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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