From 0f5021d39dea4dfce7d5d3f54f9f85c9b6a9b7e5 Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Wed, 6 Jun 2018 17:07:26 -0400 Subject: [PATCH] Add various config complete file flag to tsconfig Story: 2002882 Task: 22845 Change-Id: I03beab02aee1f47d5e66570c74a2eadf75e52da0 Signed-off-by: Jack Ding --- tsconfig/tsconfig/tsconfig/tsconfig.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tsconfig/tsconfig/tsconfig/tsconfig.py b/tsconfig/tsconfig/tsconfig/tsconfig.py index b9a68b23..01368f67 100644 --- a/tsconfig/tsconfig/tsconfig/tsconfig.py +++ b/tsconfig/tsconfig/tsconfig/tsconfig.py @@ -43,7 +43,7 @@ PUPPET_CONF_PATH = '/etc/puppet' def _load(): global SW_VERSION, nodetype, subfunctions # Read the build.info file - build_info='/etc/build.info' + build_info = '/etc/build.info' if not os.path.isfile(build_info): # Assume that we are in a test environment. Dirty, dirty, dirty... @@ -140,7 +140,8 @@ def _load(): global distributed_cloud_role if config.has_option('platform_conf', 'distributed_cloud_role'): - distributed_cloud_role = config.get('platform_conf', 'distributed_cloud_role') + distributed_cloud_role = config.get('platform_conf', + 'distributed_cloud_role') global security_feature if config.has_option('platform_conf', 'security_feature'): @@ -168,6 +169,15 @@ PUPPET_PATH = PLATFORM_PATH + "/puppet/" + SW_VERSION + "/" CGCS_PATH = "/opt/cgcs" KEYRING_PATH = PLATFORM_PATH + "/.keyring/" + SW_VERSION +# Controller configuration flags + +# Set after the first application of controller manifests +INITIAL_CONTROLLER_CONFIG_COMPLETE = os.path.join( + PLATFORM_CONF_PATH, ".initial_controller_config_complete") +# Set after each application of controller manifests +VOLATILE_CONTROLLER_CONFIG_COMPLETE = os.path.join( + VOLATILE_PATH, ".controller_config_complete") + # Compute configuration flags # Set after initial application of node manifest @@ -183,6 +193,15 @@ VOLATILE_COMPUTE_CONFIG_COMPLETE = os.path.join( VOLATILE_DISABLE_COMPUTE_SERVICES = os.path.join( VOLATILE_PATH, ".disable_compute_services") +# Storage configuration flags + +# Set after the first application of storage manifests +INITIAL_STORAGE_CONFIG_COMPLETE = os.path.join( + PLATFORM_CONF_PATH, ".initial_storage_config_complete") +# Set after each application of storage manifests +VOLATILE_STORAGE_CONFIG_COMPLETE = os.path.join( + VOLATILE_PATH, ".storage_config_complete") + # Upgrade flags # Set on controller-0 to force controller-1 to do an upgrade after install.