From 46ef0280cd3e857a1f86b369c1b0961280f5b034 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 6 Dec 2018 11:11:25 -0500
Subject: [PATCH] Fleet Module - Move database stuff to the fleet module

---
 salt/fleet/init.sls | 18 ++++++++++++++++++
 salt/mysql/init.sls | 18 ------------------
 salt/top.sls        |  6 +++++-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls
index 59c02c0ce..381ce914b 100644
--- a/salt/fleet/init.sls
+++ b/salt/fleet/init.sls
@@ -30,3 +30,21 @@ so-fleet:
       - /etc/pki/fleet.crt:/ssl/server.cert
     - watch:
       - /opt/so/conf/fleet/etc
+
+fleetdb:
+  mysql_database.present:
+    - name: fleet
+
+fleetdbuser:
+  mysql_user.present:
+    - host: 172.17.0.0/255.255.0.0
+    - password: {{ FLEETPASS }}
+    - connection_user: root
+    - connection_pass: {{ MYSQLPASS }}
+
+fleetdbpriv:
+  mysql_grants.present:
+    - grant: all privileges
+    - database: fleet.*
+    - user: fleetdbuser
+    - host: 172.17.0.0/255.255.0.0
diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index 36faf9675..0996ed3a7 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -65,21 +65,3 @@ so-mysql:
       - /opt/so/log/mysql:/var/log/mysql:rw
     - watch:
       - /opt/so/conf/mysql/etc
-
-fleetdb:
-  mysql_database.present:
-    - name: fleet
-
-fleetdbuser:
-  mysql_user.present:
-    - host: 172.17.0.0/255.255.0.0
-    - password: {{ FLEETPASS }}
-    - connection_user: root
-    - connection_pass: {{ MYSQLPASS }}
-
-fleetdbpriv:
-  mysql_grants.present:
-    - grant: all privileges
-    - database: fleet.*
-    - user: fleetdbuser
-    - host: 172.17.0.0/255.255.0.0
diff --git a/salt/top.sls b/salt/top.sls
index 0b2c50ca4..7db5d45b8 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -21,6 +21,7 @@ base:
     - master
     - idstools
     - redis
+    - mysql
     - elasticsearch
     - logstash
     - kibana
@@ -29,7 +30,8 @@ base:
     - bro
     - curator
     - utility
-    - schedule 
+    - schedule
+    - fleet 
 
 
   'G@role:so-master':
@@ -40,11 +42,13 @@ base:
     - master
     - idstools
     - redis
+    - mysql
     - elasticsearch
     - logstash
     - kibana
     - utility
     - schedule
+    - fleet
 
   # Storage node logic