Page MenuHomeDevCentral

No OneTemporary

diff --git a/roles/paas-docker/containers/init.sls b/roles/paas-docker/containers/init.sls
index c3ca3d7..2f1b045 100644
--- a/roles/paas-docker/containers/init.sls
+++ b/roles/paas-docker/containers/init.sls
@@ -1,14 +1,18 @@
# -------------------------------------------------------------
# Salt — Provision Docker engine
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-03-11
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% set services = salt['node.filter_by_name']('docker_containers') %}
+{% if services %}
+
include:
{% for service in services %}
- .{{ service }}
{% endfor %}
+
+{% endif %}
diff --git a/roles/paas-docker/docker/networks.sls b/roles/paas-docker/docker/networks.sls
index fc3d234..ecbb948 100644
--- a/roles/paas-docker/docker/networks.sls
+++ b/roles/paas-docker/docker/networks.sls
@@ -1,23 +1,23 @@
# -------------------------------------------------------------
# Salt — Provision Docker engine
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-09-11
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% set networks = pillar['docker_networks'][grains['id']] %}
+{% set networks = salt['pillar.get']("docker_networks:" + grains['id'], {}) %}
# -------------------------------------------------------------
# Bridge networks
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% for network, args in networks.items() %}
docker_network_{{ network }}:
docker_network.present:
- name: {{ network }}
- driver: bridge
- subnet: {{ args['subnet'] }}
{% endfor %}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Oct 11, 21:53 (1 d, 9 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3063728
Default Alt Text
(1 KB)

Event Timeline