Merge "Fix no-member errors in legacy sysinv ceph code"
This commit is contained in:
commit
e78c657eb0
|
@ -1,7 +1,7 @@
|
|||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
#
|
||||
# Copyright (c) 2016-2019 Wind River Systems, Inc.
|
||||
# Copyright (c) 2016-2022 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
@ -773,15 +773,6 @@ class CephOperator(object):
|
|||
return False
|
||||
return True
|
||||
|
||||
# TODO(CephPoolsDecouple): rework - determine the existing pools
|
||||
def get_pools_config(self):
|
||||
for pool in CEPH_POOLS:
|
||||
# Here it is okay for object pool name is either
|
||||
# constants.CEPH_POOL_OBJECT_GATEWAY_NAME_JEWEL or
|
||||
# constants.CEPH_POOL_OBJECT_GATEWAY_NAME_HAMMER
|
||||
pool['quota_gib'] = self.set_quota_gib(pool['pool_name'])
|
||||
return CEPH_POOLS
|
||||
|
||||
# TODO(CephPoolsDecouple): remove
|
||||
# This used to be a rpc call to ceph-manager, however after
|
||||
# Ceph Pools Decouple task its return value is always 0.
|
||||
|
|
|
@ -12806,9 +12806,6 @@ class ConductorManager(service.PeriodicService):
|
|||
}
|
||||
self._config_apply_runtime_manifest(context, config_uuid, config_dict)
|
||||
|
||||
def get_ceph_pools_config(self, context):
|
||||
return self._ceph.get_pools_config()
|
||||
|
||||
def get_controllerfs_lv_sizes(self, context):
|
||||
system = self.dbapi.isystem_get_one()
|
||||
system_dc_role = system.get('distributed_cloud_role', None)
|
||||
|
|
Loading…
Reference in New Issue