diff --git a/opencontrail/files/2.2/contrail-control.conf b/opencontrail/files/2.2/contrail-control.conf
index 4fd07dd..6cd29ce 100644
--- a/opencontrail/files/2.2/contrail-control.conf
+++ b/opencontrail/files/2.2/contrail-control.conf
@@ -29,7 +29,10 @@
 
 [IFMAP]
   certs_store=
-  password={{ control.bind.address }}
+  password=control-node-1
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
-  user={{ control.bind.address }}
+{%- if grains.get('virtual_subtype', None) == "Docker" %}
+  server_url=https://{{ control.discovery.host }}:8443
+{%- endif %}
+  user=control-node-1
 
diff --git a/opencontrail/files/3.0/contrail-analytics-api.conf b/opencontrail/files/3.0/contrail-analytics-api.conf
index 4a498b3..072b811 100644
--- a/opencontrail/files/3.0/contrail-analytics-api.conf
+++ b/opencontrail/files/3.0/contrail-analytics-api.conf
@@ -1,8 +1,7 @@
 {%- 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
+cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:9042 {% endfor %}
 http_server_port = 8090
 rest_api_port = {{ collector.bind.get('port', '8081') }}
 rest_api_ip = 0.0.0.0 
diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index ff92939..86aa8be 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -4,7 +4,7 @@
 ifmap_server_port=8443
 ifmap_username=api-server
 ifmap_password=api-server
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
 listen_ip_addr=0.0.0.0
 listen_port={{ config.bind.get('api_port', '8082') }}
 multi_tenancy={{ config.get('multi_tenancy', 'true')|lower }}
diff --git a/opencontrail/files/3.0/contrail-control.conf b/opencontrail/files/3.0/contrail-control.conf
index 4fd07dd..ad2d046 100644
--- a/opencontrail/files/3.0/contrail-control.conf
+++ b/opencontrail/files/3.0/contrail-control.conf
@@ -29,7 +29,9 @@
 
 [IFMAP]
   certs_store=
-  password={{ control.bind.address }}
+  password=control-node-1
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
-  user={{ control.bind.address }}
-
+{%- if grains.get('virtual_subtype', None) == "Docker" %}
+  server_url=https://{{ control.discovery.host }}:8443
+{%- endif %}
+  user=control-node-1
diff --git a/opencontrail/files/3.0/contrail-device-manager.conf b/opencontrail/files/3.0/contrail-device-manager.conf
index 515179e..b60e43f 100644
--- a/opencontrail/files/3.0/contrail-device-manager.conf
+++ b/opencontrail/files/3.0/contrail-device-manager.conf
@@ -6,7 +6,7 @@
 api_server_port=8082
 zk_server_ip={% for member in config.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
 log_file=/var/log/contrail/contrail-device-manager.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
 disc_server_ip={{ config.discovery.host }}
 disc_server_port=5998
 log_local=1
diff --git a/opencontrail/files/3.0/contrail-discovery.conf b/opencontrail/files/3.0/contrail-discovery.conf
index 3a4e100..18b84dd 100644
--- a/opencontrail/files/3.0/contrail-discovery.conf
+++ b/opencontrail/files/3.0/contrail-discovery.conf
@@ -6,7 +6,7 @@
 listen_port={{ config.bind.get('discovery_port', '5998') }}
 log_local=True
 log_file=/var/log/contrail/discovery.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
 log_level=SYS_NOTICE
 
 # minimim time to allow client to cache service information (seconds)
diff --git a/opencontrail/files/3.0/contrail-query-engine.conf b/opencontrail/files/3.0/contrail-query-engine.conf
index fc0e87f..e6a2504 100644
--- a/opencontrail/files/3.0/contrail-query-engine.conf
+++ b/opencontrail/files/3.0/contrail-query-engine.conf
@@ -7,7 +7,7 @@
 
 [DEFAULT]
 # analytics_data_ttl=48
-cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:9042 {% endfor %}
 #collectors=127.0.0.1:8086
 hostip={{ collector.bind.address }}
 # hostname= # Retrieved as `hostname`
diff --git a/opencontrail/files/3.0/contrail-schema.conf b/opencontrail/files/3.0/contrail-schema.conf
index 9532ed6..23d7b6c 100644
--- a/opencontrail/files/3.0/contrail-schema.conf
+++ b/opencontrail/files/3.0/contrail-schema.conf
@@ -9,7 +9,7 @@
 #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/contrail-schema.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
 disc_server_ip={{ config.discovery.host }}
 disc_server_port=5998
 log_local=1
diff --git a/opencontrail/files/3.0/contrail-svc-monitor.conf b/opencontrail/files/3.0/contrail-svc-monitor.conf
index 48898a9..dc756f0 100644
--- a/opencontrail/files/3.0/contrail-svc-monitor.conf
+++ b/opencontrail/files/3.0/contrail-svc-monitor.conf
@@ -10,7 +10,7 @@
 #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/contrail-svc-monitor.log
-cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
+cassandra_server_list={% for member in config.database.members %}{{ member.host }}:9160 {% endfor %}
 disc_server_ip={{ config.discovery.host }}
 disc_server_port=5998
 region_name=RegionOne
diff --git a/opencontrail/map.jinja b/opencontrail/map.jinja
index 238203f..a3be5a5 100644
--- a/opencontrail/map.jinja
+++ b/opencontrail/map.jinja
@@ -12,7 +12,7 @@
 
 {% set collector = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['contrail-analytics', 'python-kafka-python', 'python-cassandra'],
+        'pkgs': ['contrail-analytics', 'python-cassandra'],
         'redis_config': '/etc/redis/redis.conf',
         'services': ['supervisor-analytics','redis-server']
     },
diff --git a/opencontrail/meta/salt.yml b/opencontrail/meta/salt.yml
new file mode 100644
index 0000000..21080ce
--- /dev/null
+++ b/opencontrail/meta/salt.yml
@@ -0,0 +1,43 @@
+orchestrate:
+  database:
+    priority: 600
+    batch: 1
+    require:
+    - salt: keystone.server
+    - salt: neutron.server
+  config:
+    priority: 610
+    batch: 1
+    require:
+    - salt: opencontrail.database
+  control:
+    priority: 620
+    batch: 1
+    require:
+    - salt: opencontrail.database
+  collector:
+    priority: 630
+    batch: 1
+    require:
+    - salt: opencontrail.database
+  compute:
+    priority: 640
+    batch: 1
+    require:
+    - salt: opencontrail.config
+    - salt: opencontrail.control
+  tor:
+    priority: 650
+    batch: 1
+    require:
+    - salt: opencontrail.config
+    - salt: opencontrail.control
+  client:
+    priority: 660
+  web:
+    priority: 670
+    batch: 1
+    require:
+    - salt: opencontrail.config
+    - salt: opencontrail.collector
+
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 6710a50..8c07e58 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -18,7 +18,7 @@
 SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
 SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
 
-SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR}"
+SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR} --log-file=/dev/null"
 
 if [ "x${SALT_VERSION}" != "x" ]; then
     PIP_SALT_VERSION="==${SALT_VERSION}"