Provision apiserver ssl option in analytics services

api_server_use_ssl option should be provisioned in all analytics
services that connect to the api-server

Change-Id: I5ceca42cae62ca397f69e6f80c6099df3461a1b4
Partial-Bug: #1671296

contrail_provisioning/collector/setup.py

@@ -57,10 +57,10 @@ def __init__(self, args_str = None):
             self.zookeeper_server_list = [(zookeeper_server_ip, zookeeper_port) for \
                 zookeeper_server_ip in self._args.zookeeper_ip_list]
 
-        self.api_ssl_enabled = False
+        self.api_ssl_enabled = 'False'
         if (self._args.apiserver_keyfile and
                 self._args.apiserver_certfile and self._args.apiserver_cafile):
-            self.api_ssl_enabled = True
+            self.api_ssl_enabled = 'True'
         self.keystone_ssl_enabled = False
         if (self._args.keystone_keyfile and
                 self._args.keystone_certfile and self._args.keystone_cafile):
@@ -193,6 +193,8 @@ def fixup_contrail_alarm_gen(self):
                         collector_list_str)
         self.set_config(ALARM_GEN_CONF_FILE, 'API_SERVER', 'api_server_list',
                 self._args.cfgm_ip+':8082')
+        self.set_config(ALARM_GEN_CONF_FILE, 'API_SERVER', 'api_server_use_ssl',
+                self.api_ssl_enabled)
 
     def fixup_contrail_snmp_collector(self):
         conf_fl = '/etc/contrail/contrail-snmp-collector.conf'
@@ -208,6 +210,8 @@ def fixup_contrail_snmp_collector(self):
                         for server in self._args.collector_ip_list))
         self.set_config(conf_fl, 'API_SERVER', 'api_server_list',
                 self._args.cfgm_ip+':8082')
+        self.set_config(conf_fl, 'API_SERVER', 'api_server_use_ssl',
+                self.api_ssl_enabled)
         self.set_config('/etc/contrail/supervisord_analytics_files/' +\
                         'contrail-snmp-collector.ini',
                         'program:contrail-snmp-collector',
@@ -238,6 +242,8 @@ def fixup_contrail_topology(self):
                         for server in self._args.collector_ip_list))
         self.set_config(conf_fl, 'API_SERVER', 'api_server_list',
                 self._args.cfgm_ip+':8082')
+        self.set_config(conf_fl, 'API_SERVER', 'api_server_use_ssl',
+                self.api_ssl_enabled)
         self.set_config('/etc/contrail/supervisord_analytics_files/' +\
                         'contrail-topology.ini',
                         'program:contrail-topology',
@@ -264,7 +270,8 @@ def fixup_contrail_collector(self):
                          '__contrail_analytics_syslog_port__' : str(self._args.analytics_syslog_port),
                          '__contrail_redis_password__' : '',
                          '__contrail_kafka_broker_list__':'',
-                         '__contrail_api_server_list__' : self._args.cfgm_ip+':8082'
+                         '__contrail_api_server_list__' : self._args.cfgm_ip+':8082',
+                         '__contrail_api_server_use_ssl__' : self.api_ssl_enabled
                        }
         if self.zookeeper_server_list:
             template_vals['__contrail_zookeeper_server_list__'] = \
@@ -340,7 +347,7 @@ def fixup_contrail_analytics_api(self):
             'analytics_statistics_ttl' : self._args.analytics_statistics_ttl,
             'analytics_flow_ttl' : self._args.analytics_flow_ttl,
             'api_server' : self._args.cfgm_ip + ':8082',
-            'api_server_use_ssl': 'True' if self.api_ssl_enabled else 'False',
+            'api_server_use_ssl': self.api_ssl_enabled,
             'zk_list': ' '.join('%s:%s' % zookeeper_server for \
                 zookeeper_server in self.zookeeper_server_list),
             'collectors': ' '.join('%s:%s' %(server, '8086') \

contrail_provisioning/collector/templates/contrail_collector_conf.py

@@ -90,5 +90,6 @@
 [API_SERVER]
 # List of api-servers specified as ip:port separated by space
 api_server_list=$__contrail_api_server_list__
+api_server_use_ssl=$__contrail_api_server_use_ssl__
 
 """)

contrail_provisioning/collector/upgrade.py

@@ -167,16 +167,23 @@ def update_config(self):
             collector_conf = '/etc/contrail/contrail-collector.conf'
             set_config(collector_conf, 'API_SERVER', 'api_server_list',
                     self._args.cfgm_ip+':8082')
+            set_config(collector_conf, 'API_SERVER', 'api_server_use_ssl',
+                    self.api_ssl_enabled)
             alarmgen_conf = '/etc/contrail/contrail-alarm-gen.conf'
             self.set_config(alarmgen_conf, 'API_SERVER', 'api_server_list',
                     self._args.cfgm_ip+':8082')
+            self.set_config(alarmgen_conf, 'API_SERVER', 'api_server_use_ssl',
+                    self.api_ssl_enabled)
             snmp_collector_conf = '/etc/contrail/contrail-snmp-collector.conf'
             self.set_config(snmp_collector_conf, 'API_SERVER', 'api_server_list',
                     self._args.cfgm_ip+':8082')
+            self.set_config(snmp_collector_conf, 'API_SERVER', 'api_server_use_ssl',
+                    self.api_ssl_enabled)
             topology_conf = '/etc/contrail/contrail-topology.conf'
             self.set_config(topology_conf, 'API_SERVER', 'api_server_list',
                     self._args.cfgm_ip+':8082')
-
+            self.set_config(topology_conf, 'API_SERVER', 'api_server_use_ssl',
+                    self.api_ssl_enabled)
     # end update_config
 
 def main():