starlingx/update
Code Issues Proposed changes

Merge "Add various config complete file flag to tsconfig"

Browse Source
This commit is contained in:
Zuul 2018-07-26 15:28:58 +00:00 committed by Gerrit Code Review
commit ade7146599
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

@ -43,7 +43,7 @@ PUPPET_CONF_PATH = '/etc/puppet'
def _load(): def _load():
global SW_VERSION, nodetype, subfunctions global SW_VERSION, nodetype, subfunctions
# Read the build.info file # Read the build.info file
build_info='/etc/build.info' build_info = '/etc/build.info'
if not os.path.isfile(build_info): if not os.path.isfile(build_info):
# Assume that we are in a test environment. Dirty, dirty, dirty... # Assume that we are in a test environment. Dirty, dirty, dirty...
@ -140,7 +140,8 @@ def _load():
global distributed_cloud_role global distributed_cloud_role
if config.has_option('platform_conf', '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 global security_feature
if config.has_option('platform_conf', 'security_feature'): if config.has_option('platform_conf', 'security_feature'):
@ -170,6 +171,15 @@ KEYRING_PATH = PLATFORM_PATH + "/.keyring/" + SW_VERSION
EXTENSION_PATH = "/opt/extension" EXTENSION_PATH = "/opt/extension"
PLATFORM_CEPH_CONF_PATH = CONFIG_PATH + 'ceph-config' PLATFORM_CEPH_CONF_PATH = CONFIG_PATH + 'ceph-config'
# 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 # Compute configuration flags
# Set after initial application of node manifest # Set after initial application of node manifest
@ -185,6 +195,15 @@ VOLATILE_COMPUTE_CONFIG_COMPLETE = os.path.join(
VOLATILE_DISABLE_COMPUTE_SERVICES = os.path.join( VOLATILE_DISABLE_COMPUTE_SERVICES = os.path.join(
VOLATILE_PATH, ".disable_compute_services") 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 # Upgrade flags
# Set on controller-0 to force controller-1 to do an upgrade after install. # Set on controller-0 to force controller-1 to do an upgrade after install.