diff --git a/software/scripts/create-postgres-database b/software/scripts/create-postgres-database index 6b55951f..930e1eea 100644 --- a/software/scripts/create-postgres-database +++ b/software/scripts/create-postgres-database @@ -119,7 +119,7 @@ class PostgresDatabase: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) port = None error = False diff --git a/software/scripts/deploy-precheck b/software/scripts/deploy-precheck index 4b09393a..ca395f2b 100644 --- a/software/scripts/deploy-precheck +++ b/software/scripts/deploy-precheck @@ -513,5 +513,5 @@ def main(argv=None): if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) sys.exit(main()) diff --git a/software/scripts/deploy-start b/software/scripts/deploy-start index 4986c489..13bc4aa3 100755 --- a/software/scripts/deploy-start +++ b/software/scripts/deploy-start @@ -202,7 +202,7 @@ class DeployStart: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) from_version = None to_version = None diff --git a/software/scripts/major-release-upload b/software/scripts/major-release-upload index 5abfd156..fb6c5a8f 100644 --- a/software/scripts/major-release-upload +++ b/software/scripts/major-release-upload @@ -388,5 +388,5 @@ def main(): if __name__ == "__main__": - upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) sys.exit(main()) diff --git a/software/scripts/prepare-chroot-mounts b/software/scripts/prepare-chroot-mounts index 56f633f3..adb7da81 100644 --- a/software/scripts/prepare-chroot-mounts +++ b/software/scripts/prepare-chroot-mounts @@ -110,7 +110,7 @@ class ChrootMounts: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) checkout_dir = None operation = None diff --git a/software/scripts/prepare-data-migration b/software/scripts/prepare-data-migration index 29baa5d2..41c5fe0f 100644 --- a/software/scripts/prepare-data-migration +++ b/software/scripts/prepare-data-migration @@ -340,5 +340,5 @@ def main(sys_argv): if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) sys.exit(main(sys.argv)) diff --git a/software/scripts/remove-temporary-data b/software/scripts/remove-temporary-data index 93d936cd..ebcf270d 100644 --- a/software/scripts/remove-temporary-data +++ b/software/scripts/remove-temporary-data @@ -111,7 +111,7 @@ class RemoveTemporaryData: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) checkout_dir = None for arg in range(1, len(sys.argv)): diff --git a/software/scripts/sync-controllers-feed b/software/scripts/sync-controllers-feed index 7801f696..6b6d1eec 100644 --- a/software/scripts/sync-controllers-feed +++ b/software/scripts/sync-controllers-feed @@ -98,5 +98,5 @@ def main(sys_argv): return 1 if __name__ == "__main__": - upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) sys.exit(main(sys.argv)) diff --git a/software/scripts/upgrade_utils.py b/software/scripts/upgrade_utils.py index bf2a284a..86ce3aa6 100644 --- a/software/scripts/upgrade_utils.py +++ b/software/scripts/upgrade_utils.py @@ -178,7 +178,7 @@ def get_system_info(sysinv_client): return system_info.system_type, system_info.system_mode -def configure_logging(filename, log_level=logging.INFO): +def configure_logging(filename, logger, log_level=logging.INFO): read_log_config() my_exec = os.path.basename(sys.argv[0]) @@ -187,10 +187,10 @@ def configure_logging(filename, log_level=logging.INFO): log_format = log_format.replace('%(exec)s', my_exec) formatter = logging.Formatter(log_format, datefmt="%FT%T") - LOG.setLevel(log_level) + logger.setLevel(log_level) main_log_handler = logging.FileHandler(filename) main_log_handler.setFormatter(formatter) - LOG.addHandler(main_log_handler) + logger.addHandler(main_log_handler) def get_platform_conf(key): diff --git a/software/software/lvm_snapshot.py b/software/software/lvm_snapshot.py index cdd0104f..0597b689 100644 --- a/software/software/lvm_snapshot.py +++ b/software/software/lvm_snapshot.py @@ -503,5 +503,5 @@ def main(): if __name__ == "__main__": import upgrade_utils # pylint: disable=E0401 - upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) sys.exit(main()) diff --git a/software/software/utilities/activate.py b/software/software/utilities/activate.py index 098de942..fda62edb 100644 --- a/software/software/utilities/activate.py +++ b/software/software/utilities/activate.py @@ -5,7 +5,7 @@ # import argparse -from oslo_log import log +import logging as log from software.states import DEPLOY_STATES from software.utilities.update_deploy_state import update_deploy_state @@ -50,7 +50,7 @@ def do_activate(from_release, to_release, is_major_release): def activate(): # this is the entry point to start activate - configure_logging() + configure_logging(LOG) parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/activate_rollback.py b/software/software/utilities/activate_rollback.py index 5626cac3..249b52da 100644 --- a/software/software/utilities/activate_rollback.py +++ b/software/software/utilities/activate_rollback.py @@ -40,7 +40,7 @@ def do_activate_rollback(from_release, to_release): def activate_rollback(): # this is the entry point to start activate-rollback - configure_logging() + configure_logging(LOG) parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/deploy_delete.py b/software/software/utilities/deploy_delete.py index b5ccf0ea..1c0e75c0 100644 --- a/software/software/utilities/deploy_delete.py +++ b/software/software/utilities/deploy_delete.py @@ -44,7 +44,7 @@ def do_deploy_delete(from_release, to_release, plugin_path, is_major_release): def deploy_delete(): # this is the entry point to deploy delete plugin - utils.configure_logging() + utils.configure_logging(LOG) parser = argparse.ArgumentParser(add_help=False) plugin_path = os.environ.get('plugin_path') diff --git a/software/software/utilities/migrate.py b/software/software/utilities/migrate.py index 2baa7d5c..c1a73c43 100644 --- a/software/software/utilities/migrate.py +++ b/software/software/utilities/migrate.py @@ -843,7 +843,7 @@ def upgrade_controller(from_release, to_release, target_port): def migrate(): # this is the entry point to start data migration - configure_logging() + configure_logging(LOG) parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/utils.py b/software/software/utilities/utils.py index 8d99294c..d88ca725 100644 --- a/software/software/utilities/utils.py +++ b/software/software/utilities/utils.py @@ -42,7 +42,7 @@ ACTION_ACTIVATE_ROLLBACK = "activate-rollback" ACTION_DELETE = "delete" -def configure_logging(): +def configure_logging(logger): cfg.read_config() my_exec = os.path.basename(sys.argv[0]) @@ -51,10 +51,10 @@ def configure_logging(): log_format = log_format.replace('%(exec)s', my_exec) formatter = logging.Formatter(log_format, datefmt="%FT%T") - LOG.setLevel(logging.INFO) + logger.setLevel(logging.INFO) main_log_handler = logging.FileHandler(SOFTWARE_LOG_FILE) main_log_handler.setFormatter(formatter) - LOG.addHandler(main_log_handler) + logger.addHandler(main_log_handler) def get_migration_scripts(migration_script_dir): diff --git a/software/upgrade-scripts/04-remove-mgmt-node-addresses.py b/software/upgrade-scripts/04-remove-mgmt-node-addresses.py index f0ba3cef..6e7faaf3 100644 --- a/software/upgrade-scripts/04-remove-mgmt-node-addresses.py +++ b/software/upgrade-scripts/04-remove-mgmt-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/05-remove-admin-node-addresses.py b/software/upgrade-scripts/05-remove-admin-node-addresses.py index 42a2c3ba..13ab0f3b 100644 --- a/software/upgrade-scripts/05-remove-admin-node-addresses.py +++ b/software/upgrade-scripts/05-remove-admin-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py b/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py index 4f3f290d..2a8e25c3 100644 --- a/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py +++ b/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/07-populate-ihost-sw-version-field.py b/software/upgrade-scripts/07-populate-ihost-sw-version-field.py index b4222b48..4139e05f 100644 --- a/software/upgrade-scripts/07-populate-ihost-sw-version-field.py +++ b/software/upgrade-scripts/07-populate-ihost-sw-version-field.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/08-activate-keystone.py b/software/upgrade-scripts/08-activate-keystone.py index 1727a8f9..581964ea 100755 --- a/software/upgrade-scripts/08-activate-keystone.py +++ b/software/upgrade-scripts/08-activate-keystone.py @@ -58,7 +58,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) res = 0 diff --git a/software/upgrade-scripts/09-remove-storage-node-addresses.py b/software/upgrade-scripts/09-remove-storage-node-addresses.py index 696e4cf5..10e06987 100644 --- a/software/upgrade-scripts/09-remove-storage-node-addresses.py +++ b/software/upgrade-scripts/09-remove-storage-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py b/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py index ab925c53..83f2d3a5 100644 --- a/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py +++ b/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py @@ -75,7 +75,7 @@ def main(): return ERROR arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/11-update-static-hieradata.py b/software/upgrade-scripts/11-update-static-hieradata.py index 577ca3aa..bcbe794a 100755 --- a/software/upgrade-scripts/11-update-static-hieradata.py +++ b/software/upgrade-scripts/11-update-static-hieradata.py @@ -44,7 +44,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/12-update-registry-central.py b/software/upgrade-scripts/12-update-registry-central.py index d57edbb6..f1a1b8cb 100755 --- a/software/upgrade-scripts/12-update-registry-central.py +++ b/software/upgrade-scripts/12-update-registry-central.py @@ -88,7 +88,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py b/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py index 301367d6..c8421804 100644 --- a/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py +++ b/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py @@ -191,7 +191,7 @@ def main(): return ERROR arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/13-update-host-address.py b/software/upgrade-scripts/13-update-host-address.py index 63a2c34e..bd2ac5a2 100755 --- a/software/upgrade-scripts/13-update-host-address.py +++ b/software/upgrade-scripts/13-update-host-address.py @@ -39,7 +39,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) res = 0 LOG.info("%s invoked from_release = %s to_release = %s action = %s" diff --git a/software/upgrade-scripts/18-disable-portieris-webhook.py b/software/upgrade-scripts/18-disable-portieris-webhook.py index c0aeb218..55a5ef7f 100644 --- a/software/upgrade-scripts/18-disable-portieris-webhook.py +++ b/software/upgrade-scripts/18-disable-portieris-webhook.py @@ -159,7 +159,7 @@ def main(): return ERROR arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/197-reset-config-target.py b/software/upgrade-scripts/197-reset-config-target.py index d5eda058..94ae6aaa 100755 --- a/software/upgrade-scripts/197-reset-config-target.py +++ b/software/upgrade-scripts/197-reset-config-target.py @@ -40,7 +40,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.debug("%s invoked with from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/198-update-isystem-data.py b/software/upgrade-scripts/198-update-isystem-data.py index d2ff812f..472b6f3f 100644 --- a/software/upgrade-scripts/198-update-isystem-data.py +++ b/software/upgrade-scripts/198-update-isystem-data.py @@ -40,7 +40,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) if action in ["activate", "activate-rollback"]: try: diff --git a/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py b/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py index 9980e9b0..afcb6229 100644 --- a/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py +++ b/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py @@ -58,7 +58,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) # Activate if action == 'activate': diff --git a/software/upgrade-scripts/20-enable-fluxcd-controllers.py b/software/upgrade-scripts/20-enable-fluxcd-controllers.py index 167f2221..adea661b 100644 --- a/software/upgrade-scripts/20-enable-fluxcd-controllers.py +++ b/software/upgrade-scripts/20-enable-fluxcd-controllers.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) if action == 'activate' and from_release >= '21.12': LOG.info("%s invoked with from_release = %s to_release = %s " diff --git a/software/upgrade-scripts/202-remove-lvm-snapshots.py b/software/upgrade-scripts/202-remove-lvm-snapshots.py index aa3d261c..6799aaab 100644 --- a/software/upgrade-scripts/202-remove-lvm-snapshots.py +++ b/software/upgrade-scripts/202-remove-lvm-snapshots.py @@ -61,7 +61,7 @@ def main(): return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/21-k8s-app-upgrade.py b/software/upgrade-scripts/21-k8s-app-upgrade.py index 5d6f9a2b..bdb6369c 100644 --- a/software/upgrade-scripts/21-k8s-app-upgrade.py +++ b/software/upgrade-scripts/21-k8s-app-upgrade.py @@ -126,7 +126,7 @@ def check_apps_update_progress(client, action='update'): def main(): action = sys.argv[3] if action in ('activate', 'activate-rollback'): - configure_logging() + configure_logging(LOG) try: client = get_sysinv_client() update_operation_result = False diff --git a/software/upgrade-scripts/22-rollback-fluxcd-controllers.py b/software/upgrade-scripts/22-rollback-fluxcd-controllers.py index 1722ac3b..2962aa5a 100644 --- a/software/upgrade-scripts/22-rollback-fluxcd-controllers.py +++ b/software/upgrade-scripts/22-rollback-fluxcd-controllers.py @@ -243,7 +243,7 @@ def main(): print(f"Invalid option {sys.argv[arg]}") return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info("%s invoked with from_release %s to_release %s and action %s", sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/25-update-rate-limit.py b/software/upgrade-scripts/25-update-rate-limit.py index 00cf0931..38dcc491 100644 --- a/software/upgrade-scripts/25-update-rate-limit.py +++ b/software/upgrade-scripts/25-update-rate-limit.py @@ -32,7 +32,7 @@ PCI_CLASS = "pci-sriov" DEFAULT_POSTGRES_PORT = "5432" LOG = logging.getLogger('main_logger') -configure_logging() +configure_logging(LOG) def get_db_credentials(): diff --git a/software/upgrade-scripts/26-clean-up-deployment-data.py b/software/upgrade-scripts/26-clean-up-deployment-data.py index 19d18850..86dbf846 100644 --- a/software/upgrade-scripts/26-clean-up-deployment-data.py +++ b/software/upgrade-scripts/26-clean-up-deployment-data.py @@ -43,7 +43,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/27-reconfigure-ipsec.py b/software/upgrade-scripts/27-reconfigure-ipsec.py index 8b49cc43..36fed2ad 100644 --- a/software/upgrade-scripts/27-reconfigure-ipsec.py +++ b/software/upgrade-scripts/27-reconfigure-ipsec.py @@ -45,7 +45,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging() + configure_logging(LOG) LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)