diff --git a/salt/ca/trustca.sls b/salt/ca/trustca.sls index 1e349c654..3914a1f43 100644 --- a/salt/ca/trustca.sls +++ b/salt/ca/trustca.sls @@ -5,6 +5,9 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} +include: + - docker + cacertdir: file.directory: - name: /etc/pki/tls/certs @@ -15,6 +18,8 @@ trusttheca: file.managed: - name: /etc/pki/tls/certs/intca.crt - source: salt://ca/files/ca.crt + - listen_in: + - service: docker_running {% if GLOBALS.os_family == 'Debian' %} symlinkca: diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 026b72dea..ce5a72cc2 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -89,7 +89,6 @@ docker_running: - enable: True - watch: - file: docker_daemon - - file: trusttheca - require: - file: docker_daemon - file: trusttheca