From b884e09e7a7c4f51540392d39b14f0f28bbbd40c Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Tue, 14 Jul 2020 09:09:47 -0400
Subject: [PATCH 1/2] Playbook db init fix

---
 salt/playbook/init.sls | 15 +++------------
 setup/so-setup         |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index c2380ab3a..44b806f9a 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -6,18 +6,9 @@
 {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%}
 {%- set PLAYBOOKPASS = salt['pillar.get']('secrets:playbook', None) -%}
 
-{% if salt['mysql.db_exists']('playbook') %}
-   #Playbook database exists - Do nothing
-{% else  %}
-salt://playbook/files/playbook_db_init.sh:
-  cmd.script:
-    - cwd: /root
-    - template: jinja
-
-'sleep 5':
-  cmd.run
-{% endif %}
-
+include:
+  - mysql
+  
 create_playbookdbuser:
   module.run:
     - mysql.user_create:
diff --git a/setup/so-setup b/setup/so-setup
index 31baf3deb..c84e0dfe5 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -539,9 +539,9 @@ fi
 	fi
 
 	if [[ "$PLAYBOOK" = 1 ]]; then
-		set_progress_str 73 "$(print_salt_state_apply 'mysql')"
-		salt-call state.apply -l info mysql >> $setup_log 2>&1
-		
+		set_progress_str 73 "$(print_salt_state_apply 'playbook.db_init')"
+		salt-call state.apply -l info playbook.db_init >> $setup_log 2>&1
+
 		set_progress_str 73 "$(print_salt_state_apply 'playbook')"
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 		so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &

From 2c729400103d60cf528b81fab95e262ab8b8f8a7 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Tue, 14 Jul 2020 09:09:55 -0400
Subject: [PATCH 2/2] Playbook db init fix

---
 salt/playbook/db_init.sls | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 salt/playbook/db_init.sls

diff --git a/salt/playbook/db_init.sls b/salt/playbook/db_init.sls
new file mode 100644
index 000000000..1b2bf7b1a
--- /dev/null
+++ b/salt/playbook/db_init.sls
@@ -0,0 +1,14 @@
+
+# This state will import the initial default playbook database. 
+# If there is an existing playbook database, it will be overwritten - no backups are made.
+
+include:
+  - mysql
+
+salt://playbook/files/playbook_db_init.sh:
+  cmd.script:
+    - cwd: /root
+    - template: jinja
+
+'sleep 5':
+  cmd.run
\ No newline at end of file