commit 6fba2e72d844ff062e6f723954b8ddc64dfa3f1e
author Pavel Svimbersky <psvimbersky@mirantis.com> Tue Jan 30 08:58:31 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Jan 30 08:58:31 2018 +0000
tree 69ac1f8ba98237005d5500a2e9581e52415fbc68
parent ca8ce54a23b854b52b9f1492d8f514557fd5c094
parent 37bc5e74128da09543414cba457a8ed5629edb2e

Merge "Fix parameters name"

opencontrail/collector.sls

diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 34169ec..f9b5198 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -129,6 +129,7 @@
 
 {%- else %}
 {%- if collector.container_name is defined %}
+{%- if salt['dockerng.exists'](collector.container_name) %}
 opencontrail_collector_dockerng_services:
   dockerng_service.running:
   - services: {{ collector.services }}
@@ -143,6 +144,7 @@
     - file: /etc/contrail/contrail-analytics-nodemgr.conf
     - file: /etc/contrail/contrail-alarm-gen.conf
 {%- endif%}
+{%- endif%}
 {%- endif %}
 
 {%- endif %}

opencontrail/config.sls

diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 67d1c5a..ea996df 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -228,6 +228,7 @@
 
 {%- else %}
 {%- if config.container_name is defined %}
+{%- if salt['dockerng.exists'](config.container_name) %}
 opencontrail_config_dockerng_services:
   dockerng_service.running:
     - services: {{ config.services }}
@@ -243,6 +244,7 @@
       - file: /etc/contrail/contrail-keystone-auth.conf
       {%- endif %}
 {%- endif%}
+{%- endif%}
 
 {%- endif %}
 

opencontrail/control.sls

diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 2300968..988eb0c 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -118,6 +118,7 @@
 
 {%- else %}
 {%- if control.container_name is defined %}
+{%- if salt['dockerng.exists'](control.container_name) %}
 opencontrail_control_dockerng_services:
   dockerng_service.running:
     - services: {{ control.services }}
@@ -127,6 +128,8 @@
       - file: /etc/contrail/contrail-dns.conf
       - file: /etc/contrail/contrail-control.conf
       - file: /etc/contrail/contrail-control-nodemgr.conf
+
+{%- endif %}
 {%- endif %}
 {%- endif %}
 

opencontrail/database.sls

diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index e7a411f..56a3d61 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -278,6 +278,7 @@
 
 {%- else %}
 {%- if database.container_name is defined %}
+{%- if salt['dockerng.exists'](database.container_name) %}
 opencontrail_database_dockerng_services:
   dockerng_service.running:
     - services:
@@ -301,3 +302,5 @@
 {%- endif %}
 
 {%- endif %}
+
+{%- endif %}

opencontrail/meta/sphinx.yml

diff --git a/opencontrail/meta/sphinx.yml b/opencontrail/meta/sphinx.yml
index d245cd1..1579692 100644
--- a/opencontrail/meta/sphinx.yml
+++ b/opencontrail/meta/sphinx.yml
@@ -36,7 +36,7 @@
           value: |
             {%- for pkg in config.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.opencontrail.control is defined %}
@@ -64,7 +64,7 @@
           value: |
             {%- for pkg in control.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.opencontrail.database is defined %}
@@ -92,7 +92,7 @@
           value: |
             {%- for pkg in database.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.opencontrail.web is defined %}
@@ -121,7 +121,7 @@
           value: |
             {%- for pkg in web.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.opencontrail.collector is defined %}
@@ -149,7 +149,7 @@
           value: |
             {%- for pkg in collector.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}
   {%- if pillar.opencontrail.compute is defined %}
@@ -178,6 +178,6 @@
           value: |
             {%- for pkg in compute.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
-  {%- endif %}
\ No newline at end of file
+  {%- endif %}

opencontrail/web.sls

diff --git a/opencontrail/web.sls b/opencontrail/web.sls
index e31db89..9422efa 100644
--- a/opencontrail/web.sls
+++ b/opencontrail/web.sls
@@ -59,6 +59,7 @@
   - template: jinja
 
 {%- if web.container_name is defined %}
+{%- if salt['dockerng.exists'](web.container_name) %}
 opencontrail_web_dockerng_services:
   dockerng_service.running:
     - services:
@@ -69,6 +70,7 @@
       - file: /etc/contrail/config.global.js
       - file: /etc/contrail/contrail-webui-userauth.js
 {%- endif%}
+{%- endif%}
 
 {%- endif %}