Setup script - Change order of operations

salt/ssl/init.sls

@@ -8,6 +8,14 @@ trusttheca:
     - name: /etc/ssl/certs/intca.crt
     - text:  {{ salt['mine.get'](master, 'x509.get_pem_entries')[master]['/etc/pki/ca.crt']|replace('\n', '') }}
 
+# Install packages needed for the sensor
+
+m2cryptopkgs:
+  pkg.installed:
+    - skip_suggestions: False
+    - pkgs:
+      - python-m2crypto
+
 {% if grains['role'] == 'so-master' %}
 # Request a cert and drop it where it needs to go to be distributed
 /etc/pki/filebeat.crt:

so-setup-network.sh

@@ -423,7 +423,9 @@ saltify() {
 
     # Initialize the new repos
     apt-get update
-    apt-get -y install salt-minion
+    apt-get -y install salt-minion docker-ce
+    docker_registry
+    service docker restart
 
   fi
 
@@ -947,7 +949,6 @@ if (whiptail_you_sure); then
       whiptail_basic_suri
     fi
     whiptail_make_changes
-    docker_registry
     sensor_pillar
     copy_ssh_key
     create_bond