diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 0c35c86..96b4515 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -8,8 +8,6 @@
   pkg.installed:
   - names: {{ collector.pkgs }}
 
-{% if collector.version == 2.2 %}
-
 /etc/contrail/contrail-analytics-nodemgr.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ collector.version }}/contrail-analytics-nodemgr.conf
@@ -46,8 +44,6 @@
   - watch_in:
     - service: opencontrail_collector_services
 
-{% endif %}
-
 {{ collector.redis_config }}:
   file.managed:
   - source: salt://opencontrail/files/{{ collector.version }}/collector/redis.conf
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index b6ec393..ca24960 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -32,8 +32,6 @@
     - require_in:
       - service: opencontrail_compute_services
 
-{% if compute.version == 2.2 %}
-
 /etc/contrail/contrail-vrouter-nodemgr.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ compute.version }}/contrail-vrouter-nodemgr.conf
@@ -43,8 +41,6 @@
   - watch_in:
     - service: opencontrail_compute_services
 
-{% endif %}
-
 /etc/contrail/vrouter_nodemgr_param:
   file.managed:
   - source: salt://opencontrail/files/{{ compute.version }}/vrouter_nodemgr_param
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 1d1d5fd..f6c1fba 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -95,8 +95,6 @@
   - watch_in:
     - service: opencontrail_config_services
 
-{% if config.version == 2.2 %}
-
 /etc/contrail/contrail-config-nodemgr.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ config.version }}/contrail-config-nodemgr.conf
@@ -106,8 +104,6 @@
   - watch_in:
     - service: opencontrail_config_services
 
-{% endif %}
-
 /etc/sudoers.d/contrail_sudoers:
   file.managed:
   - source: salt://opencontrail/files/{{ config.version }}/config/contrail_sudoers
diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 50c1fa2..c988b9e 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -8,8 +8,6 @@
   pkg.installed:
   - names: {{ control.pkgs }}
 
-{% if control.version == 2.2 %}
-
 /etc/contrail/contrail-control-nodemgr.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ control.version }}/contrail-control-nodemgr.conf
@@ -19,8 +17,6 @@
   - watch_in:
     - service: opencontrail_control_services
 
-{% endif %}
-
 /etc/contrail/contrail-control.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ control.version }}/contrail-control.conf
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 6bcf20a..5426ac1 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -64,17 +64,6 @@
   - require:
     - pkg: opencontrail_database_packages
 
-{% if database.version != 2.2 %}
-
-/etc/contrail/database_nodemgr_param:
-  file.managed:
-  - source: salt://opencontrail/files/{{ database.version }}/database_nodemgr_param
-  - template: jinja
-  - require:
-    - pkg: opencontrail_database_packages
-
-{% endif %}
-
 /etc/contrail/contrail-database-nodemgr.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ database.version }}/contrail-database-nodemgr.conf
diff --git a/opencontrail/files/2.1/contrail-analytics-api.conf b/opencontrail/files/2.1/contrail-analytics-api.conf
deleted file mode 100644
index 6b04bc7..0000000
--- a/opencontrail/files/2.1/contrail-analytics-api.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- from "opencontrail/map.jinja" import collector with context %}
-[DEFAULTS]
-host_ip = {{ collector.bind.address }}
-cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
-collectors = {{ collector.bind.address }}:8086
-http_server_port = 8090
-rest_api_port = 9081
-rest_api_ip = 0.0.0.0 
-log_local = 1
-log_level = SYS_NOTICE
-log_category = 
-log_file = /var/log/contrail/contrail-analytics-api.log
-
-[DISCOVERY]
-disc_server_ip = {{ collector.discovery.host }}
-disc_server_port = 5998
-
-[REDIS]
-redis_server_port = 6379
-redis_query_port = 6379
-
diff --git a/opencontrail/files/2.1/contrail-database-nodemgr.conf b/opencontrail/files/2.1/contrail-database-nodemgr.conf
deleted file mode 100644
index 4f11b7e..0000000
--- a/opencontrail/files/2.1/contrail-database-nodemgr.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- from "opencontrail/map.jinja" import database with context %}
-[DISCOVERY]
-server={{ database.discovery.host }}
diff --git a/opencontrail/files/2.1/database_nodemgr_param b/opencontrail/files/2.1/database_nodemgr_param
deleted file mode 100644
index 6cdb496..0000000
--- a/opencontrail/files/2.1/database_nodemgr_param
+++ /dev/null
@@ -1,2 +0,0 @@
-{%- from "opencontrail/map.jinja" import database with context %}
-DISCOVERY={{ database.discovery.host }}
diff --git a/opencontrail/files/2.1/default_pmac b/opencontrail/files/2.1/default_pmac
deleted file mode 100644
index 874d3ee..0000000
--- a/opencontrail/files/2.1/default_pmac
+++ /dev/null
@@ -1,2 +0,0 @@
-{%- from "opencontrail/map.jinja" import compute with context %}
-{{ compute.interface.default_pmac }}
\ No newline at end of file
diff --git a/opencontrail/files/2.2/contrail-vrouter-agent.conf b/opencontrail/files/2.2/contrail-vrouter-agent.conf
index 3b6e9af..b33d034 100644
--- a/opencontrail/files/2.2/contrail-vrouter-agent.conf
+++ b/opencontrail/files/2.2/contrail-vrouter-agent.conf
@@ -51,7 +51,7 @@
 
 # Disable sending of flow samples to collector. Possible values are 0 and 1
 # disable_flow_collection=false
-disable_flow_collection={{ compute.get('disable_flow_collection', 'false') }}
+disable_flow_collection={{ compute.get('disable_flow_collection', 'false')|lower }}
 
 # Encapsulation type for tunnel. Possible values are MPLSoGRE, MPLSoUDP, VXLAN
 # tunnel_type=
diff --git a/opencontrail/files/2.2/default_pmac b/opencontrail/files/2.2/default_pmac
deleted file mode 100644
index 874d3ee..0000000
--- a/opencontrail/files/2.2/default_pmac
+++ /dev/null
@@ -1,2 +0,0 @@
-{%- from "opencontrail/map.jinja" import compute with context %}
-{{ compute.interface.default_pmac }}
\ No newline at end of file
diff --git a/opencontrail/files/2.1/agent_param b/opencontrail/files/3.0/agent_param
similarity index 78%
rename from opencontrail/files/2.1/agent_param
rename to opencontrail/files/3.0/agent_param
index 9e3cdae..ae5ed07 100644
--- a/opencontrail/files/2.1/agent_param
+++ b/opencontrail/files/3.0/agent_param
@@ -1,8 +1,8 @@
 {%- from "opencontrail/map.jinja" import compute with context %}
 LOG=/var/log/contrail.log
-CONFIG=/etc/contrail/agent.conf
+CONFIG=/etc/contrail/contrail-vrouter-agent.conf
 prog=/usr/bin/contrail-vrouter-agent
-kmod=vrouter
+kmod="vrouter vr_flow_entries=1048576"
 pname=contrail-vrouter-agent
 LIBDIR=/usr/lib64
 DEVICE=vhost0
diff --git a/opencontrail/files/2.1/basicauthusers.properties b/opencontrail/files/3.0/basicauthusers.properties
similarity index 100%
rename from opencontrail/files/2.1/basicauthusers.properties
rename to opencontrail/files/3.0/basicauthusers.properties
diff --git a/opencontrail/files/2.1/cassandra.yaml b/opencontrail/files/3.0/cassandra.yaml
similarity index 100%
rename from opencontrail/files/2.1/cassandra.yaml
rename to opencontrail/files/3.0/cassandra.yaml
diff --git a/opencontrail/files/2.1/collector/redis.conf b/opencontrail/files/3.0/collector/redis.conf
similarity index 98%
rename from opencontrail/files/2.1/collector/redis.conf
rename to opencontrail/files/3.0/collector/redis.conf
index 6687a28..a3b2c90 100644
--- a/opencontrail/files/2.1/collector/redis.conf
+++ b/opencontrail/files/3.0/collector/redis.conf
@@ -631,13 +631,3 @@
 # in order to commit the file to the disk more incrementally and avoid
 # big latency spikes.
 aof-rewrite-incremental-fsync yes
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis server but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
diff --git a/opencontrail/files/2.1/config.global.js b/opencontrail/files/3.0/config.global.js
similarity index 85%
rename from opencontrail/files/2.1/config.global.js
rename to opencontrail/files/3.0/config.global.js
index 0089237..a01b2bb 100644
--- a/opencontrail/files/2.1/config.global.js
+++ b/opencontrail/files/3.0/config.global.js
@@ -130,8 +130,8 @@
 
 // Analytics API server and port.
 config.analytics = {};
-config.analytics.server_ip = '{{ web.master.host }}';
-config.analytics.server_port = '8081';
+config.analytics.server_ip = '{{ web.analytics.host }}';
+config.analytics.server_port = '9081';
 config.analytics.authProtocol = 'http';
 config.analytics.strictSSL = false;
 config.analytics.ca = '';
@@ -145,7 +145,7 @@
 config.vcenter.dvsswitch = 'vswitch';           //dvsswitch name
 config.vcenter.strictSSL = false;               //Validate the certificate or ignore
 config.vcenter.ca = '';                         //specify the certificate key file
-config.vcenter.wsdl = '/usr/src/contrail/contrail-web-core/webroot/js/vim.wsdl';
+config.vcenter.wsdl = '/var/lib/contrail-webui/contrail-web-core/webroot/js/vim.wsdl';
 
 /* Discovery Service */
 config.discoveryService = {};
@@ -208,8 +208,22 @@
 /* Redis DB index for Web-UI */
 config.redisDBIndex = 3;
 
+{% if grains.os_family == "Debian" %}
 /* Logo File: Use complete path of logo file location */
-config.logo_file = '/usr/src/contrail/contrail-web-core/webroot/img/opencontrail-logo.png';
+config.logo_file = '/var/lib/contrail-webui/contrail-web-core/webroot/img/opencontrail-logo.png';
+
+/* Favicon File: Use complete path of favicon file location */
+config.favicon_file = '/var/lib/contrail-webui/contrail-web-core/webroot/img/juniper-networks-favicon.ico';
+
+config.featurePkg = {};
+/* Add new feature Package Config details below */
+config.featurePkg.webController = {};
+config.featurePkg.webController.path = '/var/lib/contrail-webui/contrail-web-controller';
+config.featurePkg.webController.enable = true;
+
+{% elif grains.os_family == "RedHat" %}
+
+config.logo_file = '/usr/src/contrail/contrail-web-core/webroot/img/juniper-networks-logo.png';
 
 /* Favicon File: Use complete path of favicon file location */
 config.favicon_file = '/usr/src/contrail/contrail-web-core/webroot/img/juniper-networks-favicon.ico';
@@ -220,6 +234,9 @@
 config.featurePkg.webController.path = '/usr/src/contrail/contrail-web-controller';
 config.featurePkg.webController.enable = true;
 
+
+{% endif %}
+
 /* Enable/disable Stat Query Links in Sidebar*/
 config.qe = {};
 config.qe.enable_stat_queries = false;
@@ -248,5 +265,23 @@
 *****************************************************************************/
 config.network = {};
 config.network.L2_enable = false;
+
+/******************************************************************************
+ * Boolean flag getDomainsFromApiServer indicates wheather the domain
+ * list should come from API Server or Identity Manager.
+ * If Set
+ *      - true, then domain list will come from API Server
+ *      - false, then domain list will come from Identity Manager
+ * Default: true
+ * NOTE: if config.identityManager.apiVersion is set as v2.0, then this flag
+ *       does not have any effect, in that case the domain list is retrieved
+ *       from API Server.
+ *
+ *****************************************************************************/
+config.getDomainsFromApiServer = false;
+
 // Export this as a module.
 module.exports = config;
+
+config.features = {};
+config.features.disabled = [];
diff --git a/opencontrail/files/2.1/config/authorization.properties b/opencontrail/files/3.0/config/authorization.properties
similarity index 100%
rename from opencontrail/files/2.1/config/authorization.properties
rename to opencontrail/files/3.0/config/authorization.properties
diff --git a/opencontrail/files/2.1/config/contrail-api b/opencontrail/files/3.0/config/contrail-api
similarity index 100%
rename from opencontrail/files/2.1/config/contrail-api
rename to opencontrail/files/3.0/config/contrail-api
diff --git a/opencontrail/files/2.1/config/contrail-api.ini b/opencontrail/files/3.0/config/contrail-api.ini
similarity index 100%
rename from opencontrail/files/2.1/config/contrail-api.ini
rename to opencontrail/files/3.0/config/contrail-api.ini
diff --git a/opencontrail/files/2.1/config/contrail-discovery b/opencontrail/files/3.0/config/contrail-discovery
similarity index 100%
rename from opencontrail/files/2.1/config/contrail-discovery
rename to opencontrail/files/3.0/config/contrail-discovery
diff --git a/opencontrail/files/2.1/config/contrail-discovery.ini b/opencontrail/files/3.0/config/contrail-discovery.ini
similarity index 100%
rename from opencontrail/files/2.1/config/contrail-discovery.ini
rename to opencontrail/files/3.0/config/contrail-discovery.ini
diff --git a/opencontrail/files/2.1/config/contrail_sudoers b/opencontrail/files/3.0/config/contrail_sudoers
similarity index 100%
rename from opencontrail/files/2.1/config/contrail_sudoers
rename to opencontrail/files/3.0/config/contrail_sudoers
diff --git a/opencontrail/files/2.1/config/log4j.properties b/opencontrail/files/3.0/config/log4j.properties
similarity index 100%
rename from opencontrail/files/2.1/config/log4j.properties
rename to opencontrail/files/3.0/config/log4j.properties
diff --git a/opencontrail/files/2.1/config/publisher.properties b/opencontrail/files/3.0/config/publisher.properties
similarity index 100%
rename from opencontrail/files/2.1/config/publisher.properties
rename to opencontrail/files/3.0/config/publisher.properties
diff --git a/opencontrail/files/3.0/contrail-alarm-gen.conf b/opencontrail/files/3.0/contrail-alarm-gen.conf
new file mode 100644
index 0000000..0a754e3
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-alarm-gen.conf
@@ -0,0 +1,18 @@
+{%- from "opencontrail/map.jinja" import collector with context %}
+[DEFAULTS]
+#host_ip = 127.0.0.1
+#collectors = 127.0.0.1:8086
+#http_server_port = 5995
+log_local = 1
+log_level = SYS_NOTICE
+#log_category = 
+log_file = /var/log/contrail/contrail-alarm-gen.log
+#kafka_broker_list = xx.xx.xx.xx:9092
+#zk_list = xx.xx.xx.xx:2181
+
+[DISCOVERY]
+#disc_server_ip = 
+#disc_server_port = 5998
+
+[REDIS]
+#redis_server_port=6379
diff --git a/opencontrail/files/3.0/contrail-analytics-api.conf b/opencontrail/files/3.0/contrail-analytics-api.conf
new file mode 100644
index 0000000..05ee4dd
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-analytics-api.conf
@@ -0,0 +1,32 @@
+{%- from "opencontrail/map.jinja" import collector with context %}
+[DEFAULTS]
+host_ip = {{ collector.bind.address }}
+cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+collectors = {{ collector.bind.address }}:8086
+http_server_port = 8090
+rest_api_port = 9081
+rest_api_ip = 0.0.0.0 
+log_local = 1
+log_level = SYS_NOTICE
+log_category = 
+log_file = /var/log/contrail/contrail-analytics-api.log
+
+# Time-to-live in hours of the various data stored by collector into
+# cassandra
+# analytics_config_audit_ttl, if not set (or set to -1), defaults to analytics_data_ttl
+# analytics_statistics_ttl, if not set (or set to -1), defaults to analytics_data_ttl
+# analytics_flow_ttl, if not set (or set to -1), defaults to analytics_statsdata_ttl
+analytics_data_ttl={{ collector.data_ttl }}
+analytics_config_audit_ttl={{ collector.data_ttl }}
+analytics_statistics_ttl={{ collector.data_ttl }}
+analytics_flow_ttl={{ collector.data_ttl }}
+
+
+[DISCOVERY]
+disc_server_ip = {{ collector.discovery.host }}
+disc_server_port = 5998
+
+[REDIS]
+redis_server_port = 6379
+redis_query_port = 6379
+
diff --git a/opencontrail/files/3.0/contrail-analytics-nodemgr.conf b/opencontrail/files/3.0/contrail-analytics-nodemgr.conf
new file mode 100644
index 0000000..452e425
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-analytics-nodemgr.conf
@@ -0,0 +1,7 @@
+{%- from "opencontrail/map.jinja" import collector with context %}
+[DISCOVERY]
+server={{ collector.discovery.host }}
+port=5998
+
+[COLLECTOR]
+#server_list=ip1:port1 ip2:port2
diff --git a/opencontrail/files/2.1/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
similarity index 100%
rename from opencontrail/files/2.1/contrail-api.conf
rename to opencontrail/files/3.0/contrail-api.conf
diff --git a/opencontrail/files/2.1/contrail-collector.conf b/opencontrail/files/3.0/contrail-collector.conf
similarity index 74%
rename from opencontrail/files/2.1/contrail-collector.conf
rename to opencontrail/files/3.0/contrail-collector.conf
index d203459..6437f20 100644
--- a/opencontrail/files/2.1/contrail-collector.conf
+++ b/opencontrail/files/3.0/contrail-collector.conf
@@ -19,6 +19,11 @@
   analytics_flow_ttl={{ collector.data_ttl }}
 
   cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+
+# IP address and port to be used to connect to kafka.
+# Multiple IP:port strings separated by space can be provided
+  kafka_broker_list=
+
 # dup=0
   hostip={{ collector.bind.address }} # Resolved IP of `hostname`
 # hostname= # Retrieved as `hostname`
@@ -30,13 +35,25 @@
 # log_file_size=1048576 # 1MB
   log_level=SYS_NOTICE
   log_local=1
+
+# TCP and UDP ports to listen on for receiving syslog messages. -1 to disable.
   syslog_port=-1
+
+# UDP port to listen on for receiving sFlow messages. -1 to disable.
+# sflow_port=6343
+
+# UDP port to listen on for receiving ipfix messages. -1 to disable.
+# ipfix_port=4739
+
 # test_mode=0
 
 [COLLECTOR]
   port=8086
 # server= 0.0.0.0
 
+# UDP port to listen on for receiving Google Protocol Buffer messages
+# protobuf_port=3333
+
 [DISCOVERY]
 # port=5998
   server={{ collector.discovery.host }} # discovery_server IP address
diff --git a/opencontrail/files/3.0/contrail-config-nodemgr.conf b/opencontrail/files/3.0/contrail-config-nodemgr.conf
new file mode 100644
index 0000000..e996f42
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-config-nodemgr.conf
@@ -0,0 +1,7 @@
+{%- from "opencontrail/map.jinja" import config with context %}
+[DISCOVERY]
+server={{ config.discovery.host }}
+port=5998
+
+[COLLECTOR]
+#server_list=ip1:port1 ip2:port2
diff --git a/opencontrail/files/3.0/contrail-control-nodemgr.conf b/opencontrail/files/3.0/contrail-control-nodemgr.conf
new file mode 100644
index 0000000..c815ba7
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-control-nodemgr.conf
@@ -0,0 +1,7 @@
+{%- from "opencontrail/map.jinja" import control with context %}
+[DISCOVERY]
+server={{ control.discovery.host }}
+port=5998
+
+[COLLECTOR]
+#server_list=ip1:port1 ip2:port2
diff --git a/opencontrail/files/2.1/contrail-control.conf b/opencontrail/files/3.0/contrail-control.conf
similarity index 100%
rename from opencontrail/files/2.1/contrail-control.conf
rename to opencontrail/files/3.0/contrail-control.conf
diff --git a/opencontrail/files/3.0/contrail-database-nodemgr.conf b/opencontrail/files/3.0/contrail-database-nodemgr.conf
new file mode 100644
index 0000000..117c751
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-database-nodemgr.conf
@@ -0,0 +1,11 @@
+{%- from "opencontrail/map.jinja" import database with context %}
+[DEFAULT]
+hostip={{ database.bind.host }}
+minimum_diskGB={{ database.minimum_disk }}
+
+[DISCOVERY]
+server={{ database.discovery.host }}
+port=5998
+
+[COLLECTOR]
+#server_list=ip1:port1 ip2:port2
diff --git a/opencontrail/files/2.1/contrail-device-manager.conf b/opencontrail/files/3.0/contrail-device-manager.conf
similarity index 100%
rename from opencontrail/files/2.1/contrail-device-manager.conf
rename to opencontrail/files/3.0/contrail-device-manager.conf
diff --git a/opencontrail/files/2.1/contrail-discovery.conf b/opencontrail/files/3.0/contrail-discovery.conf
similarity index 100%
rename from opencontrail/files/2.1/contrail-discovery.conf
rename to opencontrail/files/3.0/contrail-discovery.conf
diff --git a/opencontrail/files/2.1/contrail-dns.conf b/opencontrail/files/3.0/contrail-dns.conf
similarity index 70%
rename from opencontrail/files/2.1/contrail-dns.conf
rename to opencontrail/files/3.0/contrail-dns.conf
index ab8e816..db5de80 100644
--- a/opencontrail/files/2.1/contrail-dns.conf
+++ b/opencontrail/files/3.0/contrail-dns.conf
@@ -8,6 +8,11 @@
 [DEFAULT]
 # collectors= # Provided by discovery server
 # dns_config_file=dns_config.xml
+# named_config_file=contrail-named.conf                 # named config file
+# named_config_directory=/etc/contrail/dns              # named config directory
+# named_log_file=/var/log/contrail/contrail-named.log   # named log file
+# rndc_config_file=contrail-rndc.conf                   # rndc config file
+# rndc_secret=secretkey                                 # rndc secret
   hostip={{ control.bind.address }} # Resolved IP of `hostname`
   hostname={{ pillar.linux.system.name }} # Retrieved as `hostname`
 # http_server_port=8092
diff --git a/opencontrail/files/2.1/contrail-keystone-auth.conf b/opencontrail/files/3.0/contrail-keystone-auth.conf
similarity index 100%
rename from opencontrail/files/2.1/contrail-keystone-auth.conf
rename to opencontrail/files/3.0/contrail-keystone-auth.conf
diff --git a/opencontrail/files/2.1/contrail-query-engine.conf b/opencontrail/files/3.0/contrail-query-engine.conf
similarity index 97%
rename from opencontrail/files/2.1/contrail-query-engine.conf
rename to opencontrail/files/3.0/contrail-query-engine.conf
index 2220223..724685e 100644
--- a/opencontrail/files/2.1/contrail-query-engine.conf
+++ b/opencontrail/files/3.0/contrail-query-engine.conf
@@ -18,7 +18,7 @@
 # log_files_count=10
 # log_file_size=1048576 # 1MB
   log_level=SYS_NOTICE
-  log_local=0
+  log_local=1
 # test_mode=0
 
 [DISCOVERY]
diff --git a/opencontrail/files/2.1/contrail-schema.conf b/opencontrail/files/3.0/contrail-schema.conf
similarity index 88%
rename from opencontrail/files/2.1/contrail-schema.conf
rename to opencontrail/files/3.0/contrail-schema.conf
index d9b8e6f..83bed27 100644
--- a/opencontrail/files/2.1/contrail-schema.conf
+++ b/opencontrail/files/3.0/contrail-schema.conf
@@ -8,12 +8,14 @@
 api_server_port=8082
 #zk_server_ip=10.0.102.31:2181,10.0.102.32:2181,10.0.102.33:2181
 zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
-log_file=/var/log/contrail/schema.log
+log_file=/var/log/contrail/contrail-schema.log
 cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
 disc_server_ip={{ config.discovery.host }}
 disc_server_port=5998
 log_local=1
 log_level=SYS_NOTICE
+rabbit_server={{ config.message_queue.host }}
+rabbit_port={{ config.message_queue.port }}
 
 [SECURITY]
 use_certs=False
diff --git a/opencontrail/files/3.0/contrail-snmp-collector.conf b/opencontrail/files/3.0/contrail-snmp-collector.conf
new file mode 100644
index 0000000..7beb090
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-snmp-collector.conf
@@ -0,0 +1,33 @@
+{%- from "opencontrail/map.jinja" import collector with context %}
+[DEFAULTS]
+#api_server=127.0.0.1:8082
+
+#collectors=127.0.0.1:8086
+
+#fast_scan_frequency=60
+
+#http_server_port=5920
+
+log_local=1
+log_level=SYS_NOTICE
+log_file=/var/log/contrail/contrail-snmp-collector.log
+zookeeper = {% for member in collector.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
+
+#scan_frequency=600
+
+#zookeeper=127.0.0.1:2181
+
+[DISCOVERY]
+disc_server_ip = {{ collector.discovery.host }}
+disc_server_port = 5998
+#disc_server_ip=127.0.0.1
+#disc_server_port=5998
+
+[KEYSTONE]
+#keystone parameters come from contrail-keystone-auth.conf
+#auth_host=127.0.0.1
+#auth_protocol=http
+#auth_port=35357
+#admin_user=user1
+#admin_password=password1
+#admin_tenant_name=default-domain
diff --git a/opencontrail/files/2.1/contrail-svc-monitor.conf b/opencontrail/files/3.0/contrail-svc-monitor.conf
similarity index 86%
rename from opencontrail/files/2.1/contrail-svc-monitor.conf
rename to opencontrail/files/3.0/contrail-svc-monitor.conf
index 2e78b5e..13fbd5b 100644
--- a/opencontrail/files/2.1/contrail-svc-monitor.conf
+++ b/opencontrail/files/3.0/contrail-svc-monitor.conf
@@ -9,16 +9,18 @@
 api_server_port=8082
 #zk_server_ip=10.0.102.31:2181,10.0.102.32:2181,10.0.102.33:2181
 zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
-log_file=/var/log/contrail/svc-monitor.log
+log_file=/var/log/contrail/contrail-svc-monitor.log
 cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
 disc_server_ip={{ config.discovery.host }}
 disc_server_port=5998
 region_name=RegionOne
 log_local=1
 log_level=SYS_NOTICE
+rabbit_server={{ config.message_queue.host }}
+rabbit_port={{ config.message_queue.port }}
 
 [SCHEDULER]
-analytics_server_ip={{ config.discovery.host }}
+analytics_server_ip={{ config.analytics.host }}
 analytics_server_port=8081
 
 [SECURITY]
diff --git a/opencontrail/files/3.0/contrail-topology.conf b/opencontrail/files/3.0/contrail-topology.conf
new file mode 100644
index 0000000..60b7c94
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-topology.conf
@@ -0,0 +1,18 @@
+{%- from "opencontrail/map.jinja" import collector with context %}
+[DEFAULTS]
+analytics_api={{ collector.bind.address }}:8081
+collectors={{ collector.bind.address }}:8086
+
+#http_server_port=5921
+
+log_local=1
+log_level=SYS_NOTICE
+log_file=/var/log/contrail/contrail-topology.log
+zookeeper = {% for member in collector.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
+
+#scan_frequency=60
+
+#zookeeper=127.0.0.1:2181
+
+[DISCOVERY]
+disc_server_ip={{ collector.discovery.host }}
diff --git a/opencontrail/files/3.0/contrail-tor-agent.conf b/opencontrail/files/3.0/contrail-tor-agent.conf
new file mode 100644
index 0000000..bfdfa68
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-tor-agent.conf
@@ -0,0 +1,105 @@
+{%- from "opencontrail/map.jinja" import tor with context %}
+{%- from "opencontrail/map.jinja" import compute with context %}
+{%- from "linux/map.jinja" import system with context %}
+{%- set port = tor.bind.port + number %}
+#
+# Vnswad configuration options
+#
+
+[CONTROL-NODE]
+# IP address to be used to connect to control-node. Maximum of 2 IP addresses
+# (separated by a space) can be provided. If no IP is configured then the
+# value provided by discovery service will be used. (optional)
+# server=10.0.0.1 10.0.0.2
+
+[DEFAULT]
+agent_name={{ system.name }}-{{ number }}
+# Everything in this section is optional
+
+# IP address and port to be used to connect to collector. If these are not
+# configured, value provided by discovery service will be used. Multiple
+# IP:port strings separated by space can be provided
+# collectors=127.0.0.1:8086
+
+# Enable/disable debug logging. Possible values are 0 (disable) and 1 (enable)
+# debug=0
+
+# Aging time for flow-records in seconds
+# flow_cache_timeout=0
+
+# Hostname of compute-node. If this is not configured value from `hostname`
+# will be taken
+# hostname=
+
+# Category for logging. Default value is '*'
+# log_category=
+
+# Local log file name
+log_file=/var/log/contrail/contrail-tor-agent-{{ number }}.log
+
+# Log severity levels. Possible values are SYS_EMERG, SYS_ALERT, SYS_CRIT,
+# SYS_ERR, SYS_WARN, SYS_NOTICE, SYS_INFO and SYS_DEBUG. Default is SYS_DEBUG
+# log_level=SYS_DEBUG
+
+# Enable/Disable local file logging. Possible values are 0 (disable) and 1 (enable)
+# log_local=0
+
+# Enable/Disable local flow message logging. Possible values are 0 (disable) and 1 (enable)
+# log_flow=0
+# Encapsulation type for tunnel. Possible values are MPLSoGRE, MPLSoUDP, VXLAN
+# tunnel_type=
+
+# Enable/Disable headless mode for agent. In headless mode agent retains last
+# known good configuration from control node when all control nodes are lost.
+# Possible values are true(enable) and false(disable)
+# headless_mode=
+
+# Define agent mode. Only supported value is "tor"
+  agent_mode=tor
+
+
+# Http server port for inspecting vnswad state (useful for debugging)
+# http_server_port=8085
+http_server_port={{ port }}
+
+[DISCOVERY]
+#If DEFAULT.collectors and/or CONTROL-NODE and/or DNS is not specified this
+#section is mandatory. Else this section is optional
+
+# IP address of discovery server
+server={{ compute.discovery.host }}
+
+# Number of control-nodes info to be provided by Discovery service. Possible
+# values are 1 and 2
+# max_control_nodes=1
+
+[DNS]
+# IP address to be used to connect to dns-node. Maximum of 2 IP addresses
+# (separated by a space) can be provided. If no IP is configured then the
+# value provided by discovery service will be used. (Optional)
+# server=10.0.0.1 10.0.0.2
+
+[NETWORKS]
+# control-channel IP address used by WEB-UI to connect to vnswad to fetch
+# required information (Optional)
+control_network_ip={{ tor.control.address }}
+
+[TOR]
+# IP address of the TOR to manage
+tor_ip={{ tor.device.host }}
+
+# Identifier for ToR. Agent will subscribe to ifmap-configuration by this name
+tor_id={{ number }}
+
+# ToR management scheme is based on this type. Only supported value is "ovs"
+tor_type=ovs
+
+# OVS server port number on the ToR
+tor_ovs_port=6632
+
+# IP-Transport protocol used to connect to tor. Only supported value is "tcp"
+tor_ovs_protocol=tcp
+
+tsn_ip={{ tor.interface.address }}
+
+
diff --git a/opencontrail/files/2.1/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
similarity index 85%
rename from opencontrail/files/2.1/contrail-vrouter-agent.conf
rename to opencontrail/files/3.0/contrail-vrouter-agent.conf
index 76b6d5f..a9ae4a0 100644
--- a/opencontrail/files/2.1/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -17,6 +17,9 @@
 # IP:port strings separated by space can be provided
 # collectors=127.0.0.1:8086
 
+# Agent mode : can be vrouter / tsn / tor (default is vrouter)
+# agent_mode=
+
 # Enable/disable debug logging. Possible values are 0 (disable) and 1 (enable)
 # debug=0
 
@@ -43,6 +46,13 @@
 # Enable/Disable local file logging. Possible values are 0 (disable) and 1 (enable)
 log_local=1
 
+# Enable/Disable local flow message logging. Possible values are 0 (disable) and 1 (enable)
+# log_flow=0
+
+# Disable sending of flow samples to collector. Possible values are 0 and 1
+# disable_flow_collection=false
+disable_flow_collection={{ compute.get('disable_flow_collection', 'false')|lower }}
+
 # Encapsulation type for tunnel. Possible values are MPLSoGRE, MPLSoUDP, VXLAN
 # tunnel_type=
 
@@ -52,11 +62,20 @@
 # headless_mode=
 headless_mode=true
 
+# DHCP relay mode (true or false) to determine if a DHCP request in fabric
+# interface with an unconfigured IP should be relayed or not
+# dhcp_relay_mode=
+{%- if pillar.opencontrail.tor is defined %}
+agent_mode = tsn
+{%- endif %}
+
 [DISCOVERY]
 # If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is 
 # mandatory. Else this section is optional
 
-# IP address of discovery server
+# IP address and port of discovery server
+# port=5998
+# server=127.0.0.1
 server={{ compute.discovery.host }}
 
 # Number of control-nodes info to be provided by Discovery service. Possible
@@ -82,7 +101,11 @@
 # xen_ll_interface=
 
 # Physical interface name when hypervisor type is vmware
-vmware_physical_interface=
+#vmware_physical_interface=
+
+# Mode of operation for VMWare. Possible values esxi_neutron, vcenter
+# default is esxi_neutron
+# vmware_mode=
 
 [FLOWS]
 # Everything in this section is optional
@@ -151,10 +174,11 @@
 [SERVICE-INSTANCE]
 # Path to the script which handles the netns commands
 netns_command=/usr/bin/opencontrail-vrouter-netns
+docker_command=/usr/bin/opencontrail-vrouter-docker
 
 # Number of workers that will be used to start netns commands
 #netns_workers=1
 
 # Timeout for each netns command, when the timeout is reached, the netns
 # command is killed.
-#netns_timeout=30
\ No newline at end of file
+#netns_timeout=30
diff --git a/opencontrail/files/3.0/contrail-vrouter-nodemgr.conf b/opencontrail/files/3.0/contrail-vrouter-nodemgr.conf
new file mode 100644
index 0000000..e3f1957
--- /dev/null
+++ b/opencontrail/files/3.0/contrail-vrouter-nodemgr.conf
@@ -0,0 +1,7 @@
+{%- from "opencontrail/map.jinja" import compute with context %}
+[DISCOVERY]
+server={{ compute.discovery.host }}
+port=5998
+
+[COLLECTOR]
+#server_list=ip1:port1 ip2:port2
diff --git a/opencontrail/files/2.1/contrail-webui-userauth.js b/opencontrail/files/3.0/contrail-webui-userauth.js
similarity index 100%
rename from opencontrail/files/2.1/contrail-webui-userauth.js
rename to opencontrail/files/3.0/contrail-webui-userauth.js
diff --git a/opencontrail/files/2.1/control/contrail-named.conf b/opencontrail/files/3.0/control/contrail-named.conf
similarity index 100%
rename from opencontrail/files/2.1/control/contrail-named.conf
rename to opencontrail/files/3.0/control/contrail-named.conf
diff --git a/opencontrail/files/2.1/control/contrail-rndc.conf b/opencontrail/files/3.0/control/contrail-rndc.conf
similarity index 100%
rename from opencontrail/files/2.1/control/contrail-rndc.conf
rename to opencontrail/files/3.0/control/contrail-rndc.conf
diff --git a/opencontrail/files/2.1/ctrl-details b/opencontrail/files/3.0/ctrl-details
similarity index 75%
rename from opencontrail/files/2.1/ctrl-details
rename to opencontrail/files/3.0/ctrl-details
index 0d6ff4c..b9ded57 100644
--- a/opencontrail/files/2.1/ctrl-details
+++ b/opencontrail/files/3.0/ctrl-details
@@ -10,3 +10,9 @@
 QUANTUM_PROTOCOL=http
 AMQP_SERVER={{ common.identity.host }}
 INTERNAL_VIP={{ common.identity.host }}
+HYPERVISOR=libvirt
+NOVA_PASSWORD={{ common.identity.password }}
+NEUTRON_PASSWORD={{ common.identity.password }}
+SERVICE_TENANT_NAME=service
+
+
diff --git a/opencontrail/files/2.1/database/cassandra-env.sh b/opencontrail/files/3.0/database/cassandra-env.sh
similarity index 96%
rename from opencontrail/files/2.1/database/cassandra-env.sh
rename to opencontrail/files/3.0/database/cassandra-env.sh
index 011c84c..2ca323e 100644
--- a/opencontrail/files/2.1/database/cassandra-env.sh
+++ b/opencontrail/files/3.0/database/cassandra-env.sh
@@ -1,4 +1,4 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+{%- from "opencontrail/map.jinja" import database with context %}# Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
 # regarding copyright ownership.  The ASF licenses this file
@@ -143,6 +143,13 @@
 #MAX_HEAP_SIZE="4G"
 #HEAP_NEWSIZE="800M"
 
+{%- if database.max_heap_size is defined %}
+MAX_HEAP_SIZE="{{ database.max_heap_size }}"
+{%- endif %}
+{%- if database.heap_newsize is defined %}
+HEAP_NEWSIZE="{{ database.heap_newsize }}"
+{%- endif %}
+
 # Set this to control the amount of arenas per-thread in glibc
 #export MALLOC_ARENA_MAX=4
 
diff --git a/opencontrail/files/2.1/database/log4j.properties b/opencontrail/files/3.0/database/log4j.properties
similarity index 100%
rename from opencontrail/files/2.1/database/log4j.properties
rename to opencontrail/files/3.0/database/log4j.properties
diff --git a/opencontrail/files/2.1/keystonerc b/opencontrail/files/3.0/keystonerc
similarity index 100%
rename from opencontrail/files/2.1/keystonerc
rename to opencontrail/files/3.0/keystonerc
diff --git a/opencontrail/files/2.1/openstackrc b/opencontrail/files/3.0/openstackrc
similarity index 100%
rename from opencontrail/files/2.1/openstackrc
rename to opencontrail/files/3.0/openstackrc
diff --git a/opencontrail/files/3.0/tor/contrail-tor-agent.ini b/opencontrail/files/3.0/tor/contrail-tor-agent.ini
new file mode 100644
index 0000000..3443c3a
--- /dev/null
+++ b/opencontrail/files/3.0/tor/contrail-tor-agent.ini
@@ -0,0 +1,14 @@
+{%- from "opencontrail/map.jinja" import tor with context %}
+
+[program:contrail-tor-agent-{{ number }}]
+command=/usr/bin/contrail-tor-agent --config_file /etc/contrail/contrail-tor-agent-{{ number }}.conf
+priority=420
+autostart=true
+killasgroup=true
+stopsignal=KILL
+stdout_capture_maxbytes=1MB
+redirect_stderr=true
+stdout_logfile=/var/log/contrail/contrail-tor-agent-{{ number }}-stdout.log
+stderr_logfile=/dev/null
+startsecs=5
+exitcodes=0                   ; 'expected' exit codes for process (default 0,2)
\ No newline at end of file
diff --git a/opencontrail/files/2.1/vnc_api_lib.ini b/opencontrail/files/3.0/vnc_api_lib.ini
similarity index 100%
rename from opencontrail/files/2.1/vnc_api_lib.ini
rename to opencontrail/files/3.0/vnc_api_lib.ini
diff --git a/opencontrail/files/2.1/vrouter_nodemgr_param b/opencontrail/files/3.0/vrouter_nodemgr_param
similarity index 100%
rename from opencontrail/files/2.1/vrouter_nodemgr_param
rename to opencontrail/files/3.0/vrouter_nodemgr_param
diff --git a/opencontrail/files/2.1/zoo.cfg b/opencontrail/files/3.0/zoo.cfg
similarity index 100%
rename from opencontrail/files/2.1/zoo.cfg
rename to opencontrail/files/3.0/zoo.cfg
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..ba84cc5
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1 @@
+python-yaml