From 8315f9279e7bbbb9a498e52d680f72bf696718ff Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 6 Dec 2018 14:10:28 -0500 Subject: [PATCH] Fleet Module - Fix order --- salt/fleet/init.sls | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls index 9ecd6b661..4860ed816 100644 --- a/salt/fleet/init.sls +++ b/salt/fleet/init.sls @@ -10,6 +10,24 @@ fleetcdir: - group: 939 - makedirs: True +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 + so-fleet: docker_container.running: - image: kolide/fleet @@ -31,21 +49,3 @@ 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