From e1414432383b22b49a20bb74355b786c3b197fd9 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 14 Jan 2020 11:05:36 -0500
Subject: [PATCH] Fix some contianer links

---
 salt/common/init.sls        | 2 +-
 salt/elasticsearch/init.sls | 2 +-
 salt/filebeat/init.sls      | 2 +-
 salt/fleet/init.sls         | 2 +-
 salt/idstools/init.sls      | 2 +-
 salt/kibana/init.sls        | 2 +-
 salt/logstash/init.sls      | 2 +-
 salt/playbook/init.sls      | 4 +++-
 salt/sensoroni/init.sls     | 2 +-
 salt/suricata/init.sls      | 2 +-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 3ba2f1b11..e2c18688b 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -172,7 +172,7 @@ tgrafconf:
 
 so-telegraf:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-telegraf:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-telegraf:HH{{ VERSION }}
     - environment:
       - HOST_PROC=/host/proc
       - HOST_ETC=/host/etc
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index aba6fd384..e9d4b863f 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -108,7 +108,7 @@ eslogdir:
 
 so-elasticsearch:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-elasticsearch:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-elasticsearch:HH{{ VERSION }}
     - hostname: elasticsearch
     - name: so-elasticsearch
     - user: elasticsearch
diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls
index e4b11ef3c..46d6bd780 100644
--- a/salt/filebeat/init.sls
+++ b/salt/filebeat/init.sls
@@ -49,7 +49,7 @@ filebeatconfsync:
 
 so-filebeat:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-filebeat:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-filebeat:HH{{ VERSION }}
     - hostname: so-filebeat
     - user: root
     - extra_hosts: {{ MASTER }}:{{ MASTERIP }}
diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls
index 1cf42a9a6..85370d20d 100644
--- a/salt/fleet/init.sls
+++ b/salt/fleet/init.sls
@@ -63,7 +63,7 @@ fleetdbpriv:
 
 so-fleet:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-fleet:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-fleet:HH{{ VERSION }}
     - hostname: so-fleet
     - port_bindings:
       - 0.0.0.0:8080:8080
diff --git a/salt/idstools/init.sls b/salt/idstools/init.sls
index bba867c83..c18814243 100644
--- a/salt/idstools/init.sls
+++ b/salt/idstools/init.sls
@@ -64,7 +64,7 @@ ruleslink:
 
 so-idstools:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-idstools:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-idstools:HH{{ VERSION }}
     - hostname: so-idstools
     - user: socore
     - binds:
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 840986ff3..58eb6a32d 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -56,7 +56,7 @@ synckibanacustom:
 # Start the kibana docker
 so-kibana:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-kibana:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-kibana:HH{{ VERSION }}
     - hostname: kibana
     - user: kibana
     - environment:
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 88aac08d6..61ad8826c 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -155,7 +155,7 @@ lslogdir:
 
 so-logstash:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-logstash:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-logstash:HH{{ VERSION }}
     - hostname: so-logstash
     - name: so-logstash
     - user: logstash
diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index 6a129f84b..907e4825c 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -1,4 +1,6 @@
 {% set MASTERIP = salt['pillar.get']('master:mainip', '') %}
+{% set VERSION = salt['pillar.get']('static:soversion', '1.1.4') %}
+{% set MASTER = salt['grains.get']('master') %}
 
 playbookdb:
   file.managed:
@@ -26,7 +28,7 @@ navigatorconfig:
 
 so-playbook:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-playbook:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-playbook:HH{{ VERSION }}
     - hostname: playbook
     - name: so-playbook
     - binds:
diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls
index 8339c3ba2..44f29ef4f 100644
--- a/salt/sensoroni/init.sls
+++ b/salt/sensoroni/init.sls
@@ -32,7 +32,7 @@ sensoronisync:
 
 so-sensoroni:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-sensoroni:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-sensoroni:HH{{ VERSION }}
     - hostname: sensoroni
     - name: so-sensoroni
     - binds:
diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls
index cf821ac47..fee02d760 100644
--- a/salt/suricata/init.sls
+++ b/salt/suricata/init.sls
@@ -74,7 +74,7 @@ suriconfigsync:
 
 so-suricata:
   docker_container.running:
-    - image: {{ MASTER }}/soshybridhunter/so-suricata:HH{{ VERSION }}
+    - image: {{ MASTER }}:5000/soshybridhunter/so-suricata:HH{{ VERSION }}
     - privileged: True
     - environment:
       - INTERFACE={{ interface }}