diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 991d8a040..97f57d514 100644 --- a/salt/ssl/init.sls +++ b/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: diff --git a/so-setup-network.sh b/so-setup-network.sh index 3694db312..46d40fc6a 100644 --- a/so-setup-network.sh +++ b/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