From 9c9be7ff38f6252bb0e99586ff34f5571a45d31e Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Fri, 2 Aug 2019 13:51:33 -0400
Subject: [PATCH] Collapse the glance filesystem into platform

The filesystem /opt/cgcs is removed and its content moved under
/opt/platform.

Tested in AIO-SX, AIO-DX and Standard hardware labs.

Depends-On: https://review.opendev.org/674360
Partial-Bug: 1830142

Change-Id: I96392f293883d5583e51abfca8cac8e4c3d187a1
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
 tsconfig/centos/build_srpm.data        | 2 +-
 tsconfig/tsconfig/scripts/tsconfig     | 1 -
 tsconfig/tsconfig/tsconfig/tsconfig.py | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tsconfig/centos/build_srpm.data b/tsconfig/centos/build_srpm.data
index f60b44e0..e5741776 100644
--- a/tsconfig/centos/build_srpm.data
+++ b/tsconfig/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="tsconfig"
-TIS_PATCH_VER=9
+TIS_PATCH_VER=10
diff --git a/tsconfig/tsconfig/scripts/tsconfig b/tsconfig/tsconfig/scripts/tsconfig
index 5a779ee7..fad6142b 100644
--- a/tsconfig/tsconfig/scripts/tsconfig
+++ b/tsconfig/tsconfig/scripts/tsconfig
@@ -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
diff --git a/tsconfig/tsconfig/tsconfig/tsconfig.py b/tsconfig/tsconfig/tsconfig/tsconfig.py
index e43cdbda..e1b3f7c4 100644
--- a/tsconfig/tsconfig/tsconfig/tsconfig.py
+++ b/tsconfig/tsconfig/tsconfig/tsconfig.py
@@ -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'