commit 90e3a0f531cee662a58b78d9f7e2aa4d7446fc0c
author Petr Jediný <petr.jediny@gmail.com> Wed Jul 11 21:10:37 2018 +0200
committer Petr Jediný <petr.jediny@gmail.com> Wed Jul 11 21:10:37 2018 +0200
tree bfc60d024778a2ccebab1ba0f72b0b972f5b7831
parent a0606bcdb9e4eddcf2abac17b76a174935e2a8b7

Fix issue with docker_module interpolation

Change-Id: I28e9d13b1a9a44cd31cf45ee270dc7493c425a80

opencontrail/collector.sls

diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 8930565..d5cac04 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -144,7 +144,7 @@
 {%- else %}
   {% set docker_module = 'docker' %}
 {%- endif %}
-{%- if salt['{{ docker_module }}.exists'](collector.container_name) %}
+{%- if salt[docker_module + '.exists'](collector.container_name) %}
 opencontrail_collector_dockerng_services:
   dockerng_service.running:
   - services: {{ collector.services }}

opencontrail/config.sls

diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 53ad48e..d78cfed 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -258,7 +258,7 @@
 {%- else %}
   {% set docker_module = 'docker' %}
 {%- endif %}
-{%- if salt['{{ docker_module }}.exists'](config.container_name) %}
+{%- if salt[docker_module + '.exists'](config.container_name) %}
 opencontrail_config_dockerng_services:
   dockerng_service.running:
     - services: {{ config.services }}

opencontrail/control.sls

diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 266ab5b..a3a8876 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -140,7 +140,7 @@
 {%- else %}
   {% set docker_module = 'docker' %}
 {%- endif %}
-{%- if salt['{{ docker_module }}.exists'](control.container_name) %}
+{%- if salt[docker_module + '.exists'](control.container_name) %}
 opencontrail_control_dockerng_services:
   dockerng_service.running:
     - services: {{ control.services }}

opencontrail/database.sls

diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 9b2e06b..d51a918 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -290,7 +290,7 @@
 {%- else %}
   {% set docker_module = 'docker' %}
 {%- endif %}
-{%- if salt['{{ docker_module }}.exists'](database.container_name) %}
+{%- if salt[docker_module + '.exists'](database.container_name) %}
 opencontrail_database_dockerng_services:
   dockerng_service.running:
     - services:

opencontrail/web.sls

diff --git a/opencontrail/web.sls b/opencontrail/web.sls
index fd99375..ae2092f 100644
--- a/opencontrail/web.sls
+++ b/opencontrail/web.sls
@@ -64,7 +64,7 @@
 {%- else %}
   {% set docker_module = 'docker' %}
 {%- endif %}
-{%- if salt['{{ docker_module }}.exists'](web.container_name) %}
+{%- if salt[docker_module + '.exists'](web.container_name) %}
 opencontrail_web_dockerng_services:
   dockerng_service.running:
     - services: