From b206b23fe150aef6d6ad3d7c035f2fef2966d01a Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 23 Feb 2023 16:09:54 -0500
Subject: [PATCH 1/3] unfix playbook fix

---
 salt/playbook/init.sls | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index 8afd3d70b..5fe9ab92f 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -85,8 +85,10 @@ so-playbook:
         - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }}
     - binds:
       - /opt/so/log/playbook:/playbook/log:rw
+    - extra_hosts:
+      - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
     - environment:
-      - REDMINE_DB_MYSQL={{ DOCKER.containers['so-mysql'].ip }}
+      - REDMINE_DB_MYSQL={{ GLOBALS.manager }}
       - REDMINE_DB_DATABASE=playbook
       - REDMINE_DB_USERNAME=playbookdbuser
       - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }}

From bf512d56ec3f4942e37d7fd8942e93629da659b8 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 23 Feb 2023 16:12:57 -0500
Subject: [PATCH 2/3] unfix playbook fix

---
 salt/mysql/init.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index ba78476dc..360e3d799 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -87,12 +87,14 @@ so-mysql:
     - networks:
       - sobridge:
         - ipv4_address: {{ DOCKER.containers['so-mysql'].ip }}
+    - extra_hosts:
+      - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
     - port_bindings:
       {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %}
       - {{ BINDING }}
       {% endfor %}
     - environment:
-      - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_bip }}
+      - MYSQL_ROOT_HOST={{ GLOBALS.manager }}
       - MYSQL_ROOT_PASSWORD=/etc/mypass
     - binds:
       - /opt/so/conf/mysql/etc/my.cnf:/etc/my.cnf:ro
@@ -105,7 +107,7 @@ so-mysql:
       - file: mysqlcnf
       - file: mysqlpass
   cmd.run:
-    - name: until nc -z {{ GLOBALS.so_docker_bip }} 3306; do sleep 1; done
+    - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done
     - timeout: 600
     - onchanges:
       - docker_container: so-mysql

From cd56d3a799a5748c8f3068a53b3da8aa890b0ec1 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 23 Feb 2023 16:18:22 -0500
Subject: [PATCH 3/3] unfix playbook fix

---
 salt/mysql/init.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index 360e3d799..c077695b8 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -94,7 +94,7 @@ so-mysql:
       - {{ BINDING }}
       {% endfor %}
     - environment:
-      - MYSQL_ROOT_HOST={{ GLOBALS.manager }}
+      - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_bip }}
       - MYSQL_ROOT_PASSWORD=/etc/mypass
     - binds:
       - /opt/so/conf/mysql/etc/my.cnf:/etc/my.cnf:ro