[merge] Merge master into feature/setup-refactor

salt/fleet/init.sls

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