Merge "Collapse the glance filesystem into platform"

This commit is contained in:
Zuul 2019-08-09 18:44:20 +00:00 committed by Gerrit Code Review
commit 3baa5a696e
3 changed files with 2 additions and 4 deletions

View File

@ -1,2 +1,2 @@
SRC_DIR="tsconfig"
TIS_PATCH_VER=9
TIS_PATCH_VER=10

View File

@ -14,7 +14,6 @@ VOLATILE_PATH=/var/run
PLATFORM_PATH=/opt/platform
CONFIG_PATH=${PLATFORM_PATH}/config/${SW_VERSION}
PUPPET_PATH=${PLATFORM_PATH}/puppet/${SW_VERSION}
CGCS_PATH=/opt/cgcs
# System configuration flags
INITIAL_CONFIG_COMPLETE_FLAG=${PLATFORM_CONF_PATH}/.initial_config_complete

View File

@ -1,5 +1,5 @@
"""
Copyright (c) 2014-2018 Wind River Systems, Inc.
Copyright (c) 2014-2019 Wind River Systems, Inc.
SPDX-License-Identifier: Apache-2.0
@ -172,7 +172,6 @@ CONFIG_PATH = PLATFORM_PATH + "/config/" + SW_VERSION + "/"
PUPPET_PATH = PLATFORM_PATH + "/puppet/" + SW_VERSION + "/"
ARMADA_PATH = PLATFORM_PATH + "/armada/" + SW_VERSION
HELM_OVERRIDES_PATH = PLATFORM_PATH + "/helm/" + SW_VERSION
CGCS_PATH = "/opt/cgcs"
KEYRING_PATH = PLATFORM_PATH + "/.keyring/" + SW_VERSION
EXTENSION_PATH = "/opt/extension"
PLATFORM_CEPH_CONF_PATH = CONFIG_PATH + 'ceph-config'