From c25d088367301e5002e4770374886796be656f52 Mon Sep 17 00:00:00 2001 From: Kristine Bujold Date: Fri, 2 Aug 2019 13:49:56 -0400 Subject: [PATCH] Collapse the glance filesystem into platform The filesystem /opt/cgcs is removed and its content moved under /opt/platform. Resources related to drbd-cgcs and /opt/cgcs are updated to drbd-platform and /opt/platform. Removed references of tis-extensions-controller as this RPM is no longer being built. Tested in AIO-SX, AIO-DX and Standard hardware labs. Depends-On: https://review.opendev.org/674360 Partial-Bug: 1830142 Change-Id: I49ee6023817b1ca14868b1bd5ab246f5a8c5d80b Signed-off-by: Kristine Bujold --- bsp-files/filter_out_from_storage | 1 - bsp-files/filter_out_from_worker | 1 - bsp-files/filter_out_from_worker_lowlatency | 1 - inventory/centos/build_srpm.data | 2 +- inventory/inventory/inventory/common/constants.py | 15 +++++++-------- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bsp-files/filter_out_from_storage b/bsp-files/filter_out_from_storage index 4d6dd832..563a3af8 100644 --- a/bsp-files/filter_out_from_storage +++ b/bsp-files/filter_out_from_storage @@ -279,7 +279,6 @@ nfv-client vm-topology python-networking-odl config-gate-worker -tis-extensions-controller wrs-heat-templates python-django-horizon libmlx5 diff --git a/bsp-files/filter_out_from_worker b/bsp-files/filter_out_from_worker index 5db63dc0..f5825d16 100644 --- a/bsp-files/filter_out_from_worker +++ b/bsp-files/filter_out_from_worker @@ -250,7 +250,6 @@ drbd-pacemaker drbd kmod-drbd python-networking-odl -tis-extensions-controller wrs-heat-templates python-django-horizon kernel-rt diff --git a/bsp-files/filter_out_from_worker_lowlatency b/bsp-files/filter_out_from_worker_lowlatency index 34d0885c..27f7e790 100644 --- a/bsp-files/filter_out_from_worker_lowlatency +++ b/bsp-files/filter_out_from_worker_lowlatency @@ -254,7 +254,6 @@ drbd-pacemaker drbd kmod-drbd python-networking-odl -tis-extensions-controller wrs-heat-templates python-django-horizon kernel diff --git a/inventory/centos/build_srpm.data b/inventory/centos/build_srpm.data index 73ccc3b3..291ca575 100644 --- a/inventory/centos/build_srpm.data +++ b/inventory/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="inventory" -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 diff --git a/inventory/inventory/inventory/common/constants.py b/inventory/inventory/inventory/common/constants.py index cd38462c..a36d358e 100644 --- a/inventory/inventory/inventory/common/constants.py +++ b/inventory/inventory/inventory/common/constants.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2018 Wind River Systems, Inc. +# Copyright (c) 2013-2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -188,7 +188,7 @@ SB_TIER_STATUS_IN_USE = 'in-use' SB_TYPE_CEPH_CONF_FILENAME = "ceph.conf" # Glance images path when it is file backended -GLANCE_IMAGE_PATH = tsc.CGCS_PATH + "/" + SB_SVC_GLANCE + "/images" +GLANCE_IMAGE_PATH = tsc.PLATFORM_PATH + "/" + SB_SVC_GLANCE + "/images" # Path for Ceph (internal and external) config files CEPH_CONF_PATH = "/etc/ceph/" @@ -232,8 +232,7 @@ LVM_POOL_SUFFIX = '-pool' # File system names FILESYSTEM_NAME_BACKUP = 'backup' -FILESYSTEM_NAME_CGCS = 'cgcs' -FILESYSTEM_DISPLAY_NAME_CGCS = 'glance' +FILESYSTEM_NAME_PLATFORM = 'platform' FILESYSTEM_NAME_CINDER = 'cinder' FILESYSTEM_NAME_DATABASE = 'database' FILESYSTEM_NAME_IMG_CONVERSIONS = 'img-conversions' @@ -246,7 +245,6 @@ FILESYSTEM_NAME_PATCH_VAULT = 'patch-vault' FILESYSTEM_NAME_GNOCCHI = 'gnocchi' FILESYSTEM_LV_DICT = { - FILESYSTEM_NAME_CGCS: 'cgcs-lv', FILESYSTEM_NAME_BACKUP: 'backup-lv', FILESYSTEM_NAME_SCRATCH: 'scratch-lv', FILESYSTEM_NAME_DOCKER: 'docker-lv', @@ -256,14 +254,15 @@ FILESYSTEM_LV_DICT = { FILESYSTEM_NAME_EXTENSION: 'extension-lv', FILESYSTEM_NAME_ETCD: 'etcd-lv', FILESYSTEM_NAME_PATCH_VAULT: 'patch-vault-lv', - FILESYSTEM_NAME_GNOCCHI: 'gnocchi-lv' + FILESYSTEM_NAME_GNOCCHI: 'gnocchi-lv', + FILESYSTEM_NAME_PLATFORM: 'platform-lv' } SUPPORTED_LOGICAL_VOLUME_LIST = FILESYSTEM_LV_DICT.values() SUPPORTED_FILEYSTEM_LIST = [ FILESYSTEM_NAME_BACKUP, - FILESYSTEM_NAME_CGCS, + FILESYSTEM_NAME_PLATFORM, FILESYSTEM_NAME_CINDER, FILESYSTEM_NAME_DATABASE, FILESYSTEM_NAME_EXTENSION, @@ -277,7 +276,7 @@ SUPPORTED_FILEYSTEM_LIST = [ ] SUPPORTED_REPLICATED_FILEYSTEM_LIST = [ - FILESYSTEM_NAME_CGCS, + FILESYSTEM_NAME_PLATFORM, FILESYSTEM_NAME_DATABASE, FILESYSTEM_NAME_EXTENSION, FILESYSTEM_NAME_PATCH_VAULT,