From 389ced4de773be1a163f45a1c0c8d1affde123c4 Mon Sep 17 00:00:00 2001 From: Megh Bhatt Date: Wed, 22 Feb 2017 23:15:06 -0800 Subject: [PATCH] Fix issues related to default configuration file for analytics daemons 1. Currently the analytics daemons do not pick up their default configuration file and so the supervisord ini file or the systemd service file have to launch them with the --config_file option on command line. This causes issue when either new init system is used or new provisioning method is used or when upgrading and the daemon needs an additional default configuration file 2. Change the analytics daemons to have default configuration files so that they can be launched without specifying --config_file option in the supervisord ini file or the systemd service file 3. Cleanup to display the default values when --help option is used 4. Cleanup of contrail-collector and contrail-query-engine --help display to club options based on sections Change-Id: I820a473a532b9038842c014d273812f2c48b23cc Partial-Bug: #1667082 --- contrail_provisioning/collector/setup.py | 29 ---------------------- contrail_provisioning/collector/upgrade.py | 11 -------- 2 files changed, 40 deletions(-) diff --git a/contrail_provisioning/collector/setup.py b/contrail_provisioning/collector/setup.py index 6816478c..6e6a46d6 100755 --- a/contrail_provisioning/collector/setup.py +++ b/contrail_provisioning/collector/setup.py @@ -144,35 +144,6 @@ def fixup_config_files(self): self.fixup_vnc_api_lib_ini() self.fixup_contrail_alarm_gen() self.fixup_cassandra_config() - self.fixup_ini_files() - - def fixup_analytics_daemon_ini_file(self, daemon_name, conf_files=None): - dconf_files = [] - if conf_files: - dconf_files.extend(conf_files) - daemon_conf_file = '/etc/contrail/' + daemon_name + '.conf' - dconf_files.append(daemon_conf_file) - if self._args.cassandra_user: - database_conf = '/etc/contrail/contrail-database.conf' - dconf_files.append(database_conf) - ini_conf_cmd = ''.join([' --conf_file ' + conf_file for \ - conf_file in dconf_files]) - supervisor_dir = '/etc/contrail/supervisord_analytics_files' - bin_dir = '/usr/bin' - self.set_config(os.path.join(supervisor_dir, daemon_name + '.ini'), - 'program:' + daemon_name, 'command', - os.path.join(bin_dir, daemon_name) + ini_conf_cmd) - # end fixup_analytics_daemon_ini_file - - def fixup_ini_files(self): - self.fixup_analytics_daemon_ini_file('contrail-collector', - ['/etc/contrail/contrail-keystone-auth.conf']) - self.fixup_analytics_daemon_ini_file('contrail-query-engine') - self.fixup_analytics_daemon_ini_file('contrail-analytics-api', - ['/etc/contrail/contrail-keystone-auth.conf']) - self.fixup_analytics_daemon_ini_file('contrail-alarm-gen', - ['/etc/contrail/contrail-keystone-auth.conf']) - # end fixup_ini_files def fixup_cassandra_config(self): if self._args.cassandra_user: diff --git a/contrail_provisioning/collector/upgrade.py b/contrail_provisioning/collector/upgrade.py index 706fe109..34e3d2da 100644 --- a/contrail_provisioning/collector/upgrade.py +++ b/contrail_provisioning/collector/upgrade.py @@ -125,8 +125,6 @@ def update_config(self): # if it does not exist then set it to the the passed value or # "no-auth" if no value is passed # 2. contrail-analytics-api.conf API server VIP needs to be specified - # 3. contrail-keystone-auth.conf needs to be passed to - # contrail-analytics-api via contrail-analytics-api.ini analytics_api_conf = '/etc/contrail/contrail-analytics-api.conf' has_aaa_mode = self.has_config(analytics_api_conf, 'DEFAULTS', 'aaa_mode') @@ -137,15 +135,10 @@ def update_config(self): aaa_mode) self.set_config(analytics_api_conf, 'DEFAULTS', 'api_server', self._args.cfgm_ip + ':8082') - self.fixup_analytics_daemon_ini_file('contrail-analytics-api', - ['/etc/contrail/contrail-keystone-auth.conf']) # From 3.10: # 1. Provision rabbitmq_server_list and rabbitmq_port in # contrail-alarm-gen.conf - # 2. contrail-keystone-auth.conf needs to be passed to - # contrail-alarm-gen via contrail-alarm-gen.ini and - # contrail-collector via contrail-collector.ini if (self._args.from_rel < LooseVersion('3.1') and self._args.to_rel >= LooseVersion('3.1')): alarm_gen_conf = '/etc/contrail/contrail-alarm-gen.conf' @@ -153,10 +146,6 @@ def update_config(self): ','.join(self._args.amqp_ip_list)) self.set_config(alarm_gen_conf, 'DEFAULTS', 'rabbitmq_port', self._args.amqp_port) - self.fixup_analytics_daemon_ini_file('contrail-alarm-gen', - ['/etc/contrail/contrail-keystone-auth.conf']) - self.fixup_analytics_daemon_ini_file('contrail-collector', - ['/etc/contrail/contrail-keystone-auth.conf']) # We must ensure that the number of partitions in collector # and analytics-api is same as that in alarm-gen