Don't provision analytics services to connect to local Collector

o Presently, contrail-query-engine and contrail-analytics-api services
are provisioned to connect to local collector. Comment the collector
list from contrail-query-engine.conf and contrail-analytics-api.conf
so that they can connect to the collector provided by the discovery
service.

o Provision discovery ip address in contrail-query-engine.conf and
contrail-topology.conf

Change-Id: I902193178594b8ecb8c52dc53ccfea931b43a928
Partial-Bug: #1528770

contrail_provisioning/collector/setup.py

@@ -183,6 +183,9 @@ def fixup_contrail_topology(self):
             local("[ -f %s ] || > %s" % (conf_fl, conf_fl))
         self.set_config(conf_fl, 'DEFAULTS', 'zookeeper',
             ','.join('%s:2181' % cs[0] for cs in self.cassandra_server_list))
+        self.set_config(conf_fl, 'DISCOVERY', 'disc_server_ip',
+                        self._args.cfgm_ip)
+        self.set_config(conf_fl, 'DISCOVERY', 'disc_server_port', '5998')
         self.set_config('/etc/contrail/supervisord_analytics_files/' +\
                         'contrail-topology.ini',
                         'program:contrail-topology',
@@ -227,9 +230,8 @@ def fixup_contrail_query_engine(self):
                          '__contrail_redis_server__': '127.0.0.1',
                          '__contrail_redis_server_port__' : '6379',
                          '__contrail_http_server_port__' : '8091',
-                         '__contrail_collector__' : '127.0.0.1',
-                         '__contrail_collector_port__' : '8086',
                          '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
+                         '__contrail_discovery_ip__' : self._args.cfgm_ip,
                          '__contrail_redis_password__' : ''}
         if self._args.redis_password:
             template_vals['__contrail_redis_password__'] = 'password = '+ self._args.redis_password
@@ -252,8 +254,6 @@ def fixup_contrail_analytics_api(self):
                          '__contrail_host_ip__' : self._args.self_collector_ip,
                          '__contrail_discovery_ip__' : self._args.cfgm_ip,
                          '__contrail_discovery_port__' : 5998,
-                         '__contrail_collector__': self._args.self_collector_ip,
-                         '__contrail_collector_port__': '8086',
                          '__contrail_cassandra_server_list__' : ' '.join('%s:%s' % cassandra_server for cassandra_server in self.cassandra_server_list),
                          '__contrail_analytics_data_ttl__' : self._args.analytics_data_ttl,
                          '__contrail_config_audit_ttl__' : self._args.analytics_config_audit_ttl,

contrail_provisioning/collector/templates/contrail_analytics_api_conf.py

@@ -4,7 +4,7 @@
 [DEFAULTS]
 host_ip = $__contrail_host_ip__
 cassandra_server_list=$__contrail_cassandra_server_list__
-collectors = $__contrail_collector__:$__contrail_collector_port__
+#collectors = 127.0.0.1:8086
 http_server_port = $__contrail_http_server_port__
 rest_api_port = $__contrail_rest_api_port__
 rest_api_ip = 0.0.0.0 

contrail_provisioning/collector/templates/contrail_query_engine_conf.py

@@ -9,7 +9,7 @@
 [DEFAULT]
 # analytics_data_ttl=48
   cassandra_server_list=$__contrail_cassandra_server_list__
-  collectors=$__contrail_collector__:$__contrail_collector_port__
+# collectors=127.0.0.1:8086
   hostip=$__contrail_host_ip__ # Resolved IP of `hostname`
 # hostname= # Retrieved as `hostname`
   http_server_port=$__contrail_http_server_port__
@@ -24,7 +24,7 @@
 
 [DISCOVERY]
 # port=5998
-# server= # discovery_server IP address
+  server=$__contrail_discovery_ip__
 
 [REDIS]
   port=$__contrail_redis_server_port__