commit 8b9a9afbaf35a81dc301045d888bf18caf92b24e
author Cedric Hnyda <chnyda@mirantis.com> Mon Aug 21 08:53:39 2017 +0000
committer Gerrit Code Review <gerrit2@7fdf03a22773> Mon Aug 21 08:53:39 2017 +0000
tree 64e7f1ba7ec2b1d3720bfbf43ac5ef58524eeaea
parent e8310d3027990dd8f3e4bba53015d96ac3dc9c6e
parent 01ba717bf58aff877f4b59685a3779f965c8b6b7

Merge "refactor TSN"

opencontrail/files/3.0/contrail-database-nodemgr.conf

diff --git a/opencontrail/files/3.0/contrail-database-nodemgr.conf b/opencontrail/files/3.0/contrail-database-nodemgr.conf
index 117c751..3cd6e74 100644
--- a/opencontrail/files/3.0/contrail-database-nodemgr.conf
+++ b/opencontrail/files/3.0/contrail-database-nodemgr.conf
@@ -2,6 +2,11 @@
 [DEFAULT]
 hostip={{ database.bind.host }}
 minimum_diskGB={{ database.minimum_disk }}
+{%- if pillar.opencontrail.control is defined %}
+contrail_databases=config
+{%- else %}
+contrail_databases=Analytics
+{%- endif %}
 
 [DISCOVERY]
 server={{ database.discovery.host }}

opencontrail/files/4.0/contrail-database-nodemgr.conf

diff --git a/opencontrail/files/4.0/contrail-database-nodemgr.conf b/opencontrail/files/4.0/contrail-database-nodemgr.conf
index 5ccad47..492fd8f 100644
--- a/opencontrail/files/4.0/contrail-database-nodemgr.conf
+++ b/opencontrail/files/4.0/contrail-database-nodemgr.conf
@@ -2,6 +2,11 @@
 [DEFAULT]
 hostip={{ database.bind.host }}
 minimum_diskGB={{ database.minimum_disk }}
+{%- if pillar.opencontrail.control is defined %}
+contrail_databases=config
+{%- else %}
+contrail_databases=Analytics
+{%- endif %}
 
 [COLLECTOR]
 server_list={% for member in database.analytics.members %}{{ member.host }}:8086 {% endfor %}