Selaa lähdekoodia

fix conflicting salt_ca_certificates_packages

It was failing with:
	Rendering SLS 'base:salt.minion.cert' failed: Conflicting ID 'salt_ca_certificates_packages'

ca-certificates installation should be probably moved out of the loop in
the future.

Change-Id: I26aeae62cc1c1d407d36d1d6bf101db073d9e601
pull/36/head
Tomáš Kukrál 7 vuotta sitten
vanhempi
commit
e3ae6b3bbf
No account linked to committer's email address
1 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. +4
    -4
      salt/minion/cert.sls

+ 4
- 4
salt/minion/cert.sls Näytä tiedosto

@@ -99,7 +99,7 @@ salt_minion_cert_{{ cert_name }}_dirs:

{%- if grains.os_family == 'Debian' %}

salt_ca_certificates_packages:
salt_ca_certificates_packages_{{ rowloop.index }}:
pkg.installed:
- name: ca-certificates

@@ -108,11 +108,11 @@ salt_ca_certificates_packages:
- name: "/usr/local/share/ca-certificates/ca-{{ cert.authority }}.crt"
- target: {{ ca_file }}
- watch_in:
- cmd: salt_update_certificates
- cmd: salt_update_certificates_{{ rowloop.index }}
- require:
- pkg: salt_ca_certificates_packages
- pkg: salt_ca_certificates_packages_{{ rowloop.index }}

salt_update_certificates:
salt_update_certificates_{{ rowloop.index }}:
cmd.wait:
- name: update-ca-certificates


Loading…
Peruuta
Tallenna