Closes-Bug: #1616665 - Missing keystone file, api related params in s…

…eparate collector scenario

Closes-Bug: #1616666

Three issues:
1. contrail-keystone-auth.conf missing on separate collector/db node
2. Wrong vip set in contrail-snmp-collector.conf if contrail_internal_vip set
3. Missing api_server param in contrail-analytics-api.conf

Closes-Bug: #1641093 - Previously fixed bug now to be fixed in 3.0.2.x

I have cherry picked:

1. https://review.opencontrail.org/#/c/23777/
2. https://review.opencontrail.org/#/c/23746/

Into R3.0.2.x

The bugs above are now fixed in R3.0.2.x also

Please note:
Bug 1618574 will not be fixed in R3.0.2.x (discussed with Megh)

Change-Id: I28fdce93422bf62d6c7f07c81a3fda7874c2d931

contrail/environment/modules/contrail/manifests/collector/config.pp

@@ -15,12 +15,12 @@
     $redis_password = $::contrail::params::redis_password,
     $config_ip_to_use = $::contrail::params::config_ip_to_use,
     $contrail_logoutput = $::contrail::params::contrail_logoutput,
+    $contrail_rabbit_servers= $::contrail::params::contrail_rabbit_servers,
+    $redis_config_file = $::contrail::params::redis_config_file,
     $host_roles = $::contrail::params::host_roles,
 ) {
 
     $rest_api_port_to_use = $::contrail::params::rest_api_port_to_use
-    $discovery_ip_to_use =  $::contrail::params::discovery_ip_to_use
-
      ## Cassandra Port for Cql has been changed to 9042.
     $database_ip_port_list = suffix($database_ip_list, ":9042")
     $cassandra_server_list = join($database_ip_port_list, ' ' )
@@ -31,6 +31,8 @@
     $zookeeper_ip_port_list = suffix($zookeeper_ip_list, ":$zk_ip_port")
     $zk_ip_list = join($zookeeper_ip_port_list, ',')
 
+    $analytics_api_server_to_use = "${config_ip_to_use}:8082"
+
     $contrail_snmp_collector_ini_command ="/usr/bin/contrail-snmp-collector --conf_file /etc/contrail/contrail-snmp-collector.conf --conf_file /etc/contrail/contrail-keystone-auth.conf"
     $contrail_topology_ini_command ="/usr/bin/contrail-topology --conf_file /etc/contrail/contrail-topology.conf --conf_file /etc/contrail/contrail-keystone-auth.conf"
 
@@ -71,6 +73,7 @@
       'DEFAULTS/analytics_config_audit_ttl' : value => $analytics_config_audit_ttl;
       'DEFAULTS/analytics_statistics_ttl'   : value => $analytics_statistics_ttl;
       'DEFAULTS/analytics_flow_ttl' : value => $analytics_flow_ttl;
+      'DEFAULTS/api_server' : value => $analytics_api_server_to_use;
       'DISCOVERY/disc_server_ip'   : value => $config_ip_to_use;
       'DISCOVERY/disc_server_port' : value => '5998';
       'REDIS/redis_server_port'    : value => '6379';
@@ -119,12 +122,13 @@
       'DEFAULTS/fast_scan_frequency': value => $snmp_fast_scan_frequency;
       'DEFAULTS/http_server_port'   : value => '5920';
       'DISCOVERY/disc_server_port' : value => '5998';
-      'DISCOVERY/disc_server_ip'   : value => $discovery_ip_to_use;
+      'DISCOVERY/disc_server_ip'   : value => $config_ip_to_use;
     } ->
 
     contrail_analytics_nodemgr_config {
       'DEFAULT/server' : value => $config_ip_to_use;
       'DEFAULT/port'   : value => '5998';
+      'DISCOVERY/server': value => $config_ip_to_use;
     } ->
 
     contrail_alarm_gen_config {