Common Module - Fix formatting and clean up

salt/common/init.sls

@@ -61,23 +61,6 @@ docker:
   service.running:
     - enable: True
 
-# Set up docker network
-# This is broken right now.
-#dockernet:
-#  docker_network.present:
-#    - name: so-elastic-net
-#    - driver: bridge
-
-# dockernet work around
-#dockernet:
-#  cmd.script:
-#    - source: salt://common/scripts/dockernet.sh
-
-
-# Snag the so-core docker
-toosmooth/so-core:test2:
-  docker_image.present
-
 # Drop the correct nginx config based on role
 
 nginxconfdir:
@@ -167,42 +150,42 @@ so-telegraf:
 # If its a master or eval lets install the back end for now
 {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
 
-  # Influx DB
-  influxconfdir:
-    file.directory:
-      - name: /opt/so/conf/influxdb/etc
-      - makedirs: True
+# Influx DB
+influxconfdir:
+  file.directory:
+    - name: /opt/so/conf/influxdb/etc
+    - makedirs: True
 
-  influxdbdir:
-    file.directory:
-      - name: /nsm/influxdb
-      - makedirs: True
+influxdbdir:
+  file.directory:
+    - name: /nsm/influxdb
+    - makedirs: True
 
-  so-influxdb:
-    docker_container.running:
-      - image: soshybridhunter/so-influxdb:HH1.0.4
-      - hostname: influxdb
-      - binds:
-        - /opt/so/conf/influxdb/etc:/etc/influxdb/influxdb.conf:ro
-        - /nsm/influxdb:/var/lib/influxdb:rw
-      - port_bindings:
-        - 0.0.0.0:8086:8086
+so-influxdb:
+  docker_container.running:
+    - image: soshybridhunter/so-influxdb:HH1.0.4
+    - hostname: influxdb
+    - binds:
+      - /opt/so/conf/influxdb/etc:/etc/influxdb/influxdb.conf:ro
+      - /nsm/influxdb:/var/lib/influxdb:rw
+    - port_bindings:
+      - 0.0.0.0:8086:8086
 
-  # Grafana all the things
-    grafanadir:
-      file.directory:
-        - name: /nsm/grafana
-        - makedirs: True
+# Grafana all the things
+grafanadir:
+  file.directory:
+    - name: /nsm/grafana
+    - makedirs: True
 
-    so-grafana:
-      docker_container.running:
-        - image: soshybridhunter/so-grafana:HH1.0.4
-        - hostname: grafana
-        - binds:
-          - /nsm/grafana:/var/lib/grafana:rw
-        - environment:
-          - GF_SECURITY_ADMIN_PASSWORD=augusta
-        - port_bindings:
-          - 0.0.0.0:3000:3000
+so-grafana:
+  docker_container.running:
+    - image: soshybridhunter/so-grafana:HH1.0.4
+    - hostname: grafana
+    - binds:
+      - /nsm/grafana:/var/lib/grafana:rw
+    - environment:
+      - GF_SECURITY_ADMIN_PASSWORD=augusta
+    - port_bindings:
+      - 0.0.0.0:3000:3000
 
 {% endif %}