From 5f743f1402cdda253978fbae264bc457f87d1847 Mon Sep 17 00:00:00 2001 From: marvin Date: Tue, 3 Sep 2019 04:23:06 +0000 Subject: [PATCH] Removing unused flag disable_worker_services The disable_worker_services file was originally created to prevent the (bare metal) nova-compute services from running on a newly upgraded controller in an AIO-DX configuration. This situation no longer exists because the bare metal nova-compute services do not exist after transiting to containers. this flag is no longer needed. Removing all references to the disable_worker_services file. Change-Id: I20e08db737bb0df6ba34c071e2435f1a18f7c3ed Partial-Bug: #1838432 Signed-off-by: marvin --- mtce-common/src/common/nodeBase.h | 2 -- mtce/src/pmon/pmonFsm.cpp | 9 --------- 2 files changed, 11 deletions(-) diff --git a/mtce-common/src/common/nodeBase.h b/mtce-common/src/common/nodeBase.h index 03418e34..0b4edaa1 100755 --- a/mtce-common/src/common/nodeBase.h +++ b/mtce-common/src/common/nodeBase.h @@ -135,8 +135,6 @@ void daemon_exit ( void ); #define CONFIG_COMPLETE_STORAGE ((const char *)"/var/run/.storage_config_complete") #define CONFIG_COMPLETE_FILE ((const char *)"/etc/platform/.initial_config_complete") -#define DISABLE_WORKER_SERVICES ((const char *)"/var/run/.disable_worker_services") - #define PATCHING_IN_PROG_FILE ((const char *)"/var/run/patch_installing") #define NODE_IS_PATCHED_FILE ((const char *)"/var/run/node_is_patched") diff --git a/mtce/src/pmon/pmonFsm.cpp b/mtce/src/pmon/pmonFsm.cpp index dab04ceb..607feb79 100644 --- a/mtce/src/pmon/pmonFsm.cpp +++ b/mtce/src/pmon/pmonFsm.cpp @@ -855,15 +855,6 @@ int pmon_passive_handler ( process_config_type * ptr ) start_monitoring = false; waiting_for = config_filename; } - else if ( !strcmp (ptr->subfunction, "worker" ) ) - { - if ( daemon_is_file_present ( DISABLE_WORKER_SERVICES ) == true ) - { - /* Compute services are disabled - do not start monitoring */ - start_monitoring = false; - waiting_for = DISABLE_WORKER_SERVICES; - } - } mtcTimer_reset ( ptr->pt_ptr ); if ( start_monitoring == true )