D2323.diff
No OneTemporary
Actions

Size

940 B

Referenced Files

None

Subscribers

None

D2323.diff
View Options

	diff --git a/roles/paas-docker/containers/init.sls b/roles/paas-docker/containers/init.sls
	--- a/roles/paas-docker/containers/init.sls
	+++ b/roles/paas-docker/containers/init.sls
	@@ -8,7 +8,11 @@

	{% 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
	--- a/roles/paas-docker/docker/networks.sls
	+++ b/roles/paas-docker/docker/networks.sls
	@@ -6,7 +6,7 @@
	# 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