commit 4b56924abeaab32cd23d079950fb5969e0e94b15
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jul 11 20:01:02 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Wed Jul 11 20:01:02 2018 +0000
tree b6772df505442f7a84cd2ddc00ef8e06e7153a65
parent 25b492250cef93d9f204118c8f98c5deded8cc7f
parent 90e3a0f531cee662a58b78d9f7e2aa4d7446fc0c

Merge "Fix issue with docker_module interpolation"

opencontrail/collector.sls

diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 4a0a748..107ee5a 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -151,7 +151,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 2d7c54c..486f9dc 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 417efed..89c79e2 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -297,7 +297,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: