From c6a46d1eb34e7fe52f192dd9e425ae0e17d3e4e8 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 22 Feb 2023 14:14:27 -0500
Subject: [PATCH] change playbook to use hostname

---
 salt/mysql/init.sls    |  2 +-
 salt/playbook/init.sls | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index 7f8c9f347..d6a910f32 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -105,7 +105,7 @@ so-mysql:
       - file: mysqlcnf
       - file: mysqlpass
   cmd.run:
-    - name: until nc -z {{ GLOBALS.manager_ip }} 3306; do sleep 1; done
+    - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done
     - timeout: 600
     - onchanges:
       - docker_container: so-mysql
diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index 1b75935f1..5e3285914 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -19,7 +19,7 @@ create_playbookdbuser:
     - name: playbookdbuser
     - password: {{ PLAYBOOKPASS }}
     - host: "{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0"
-    - connection_host: {{ GLOBALS.manager_ip }}
+    - connection_host: {{ GLOBALS.manager }}
     - connection_port: 3306
     - connection_user: root
     - connection_pass: {{ MYSQLPASS }}
@@ -28,7 +28,7 @@ query_playbookdbuser_grants:
   mysql_query.run:
     - database: playbook
     - query:    "GRANT ALL ON playbook.* TO 'playbookdbuser'@'{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0';"
-    - connection_host: {{ GLOBALS.manager_ip }}
+    - connection_host: {{ GLOBALS.manager }}
     - connection_port: 3306
     - connection_user: root
     - connection_pass: {{ MYSQLPASS }}
@@ -36,7 +36,7 @@ query_playbookdbuser_grants:
 query_updatwebhooks:
   mysql_query.run:
     - database: playbook
-    - query:    "update webhooks set url = 'http://{{ GLOBALS.manager_ip }}:7000/playbook/webhook' where project_id = 1"
+    - query:    "update webhooks set url = 'http://{{ GLOBALS.manager}}:7000/playbook/webhook' where project_id = 1"
     - connection_host: {{ GLOBALS.manager_ip }}
     - connection_port: 3306
     - connection_user: root
@@ -49,10 +49,10 @@ query_updatepluginurls:
         update settings set value = 
         "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
         project: '1'
-        convert_url: http://{{ GLOBALS.manager_ip }}:7000/playbook/sigmac
-        create_url: http://{{ GLOBALS.manager_ip }}:7000/playbook/play"
+        convert_url: http://{{ GLOBALS.manager }}:7000/playbook/sigmac
+        create_url: http://{{ GLOBALS.manager }}:7000/playbook/play"
         where id  = 43
-    - connection_host: {{ GLOBALS.manager_ip }}
+    - connection_host: {{ GLOBALS.manager }}
     - connection_port: 3306
     - connection_user: root
     - connection_pass: {{ MYSQLPASS }}
@@ -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={{ GLOBALS.manager_ip }}
+      - REDMINE_DB_MYSQL={{ GLOBALS.manager }}
       - REDMINE_DB_DATABASE=playbook
       - REDMINE_DB_USERNAME=playbookdbuser
       - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }}