starlingx
/
config
Code Issues Proposed changes

Remove nova storage aggregates 

Remove the automated creation of storage host aggregates and host
population in sysinv.

Story: 2004607
Task: 28505
Change-Id: I71a962297d5cdef9f27a3008a43321e577b6d954
Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
Jack Ding 2019-01-17 16:01:46 -05:00
parent 91f88e9afc
commit eb225f6ebf
5 changed files with 8 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sysinv/sysinv/sysinv/sysinv/agent/manager.py
View File

@ -889,19 +889,6 @@ class AgentManager(service.PeriodicService):
if iscsi_initiator_name is not None:
imsg_dict.update({'iscsi_initiator_name': iscsi_initiator_name})
# Before setting the host to AVAILABILITY_AVAILABLE make
# sure that nova_local aggregates are correctly set otherwise starting
# instances from images will fail as no host is found.
for volume in nova_lvgs:
# Skip making the aggregate RPC call on hosts that don't
# have a nova-local volume group.
if (volume.lvm_vg_name == constants.LVG_NOVA_LOCAL):
try:
rpcapi.update_nova_local_aggregates(icontext, self._ihost_uuid)
except AttributeError:
# safe to ignore during upgrades
LOG.warn("Skip configuration of nova-local aggregates. "
"Upgrade in progress?")
self.platform_update_by_host(rpcapi,
icontext,
self._ihost_uuid,
@ -1105,19 +1092,6 @@ class AgentManager(service.PeriodicService):
"conductor.")
pass
# Before setting the host to AVAILABILITY_AVAILABLE make
# sure that nova_local aggregates are correctly set otherwise starting
# instances from images will fail as no host is found.
for volume in nova_lvgs:
# Skip making the aggregate RPC call on hosts that don't
# have a nova-local volume group.
if (volume.lvm_vg_name == constants.LVG_NOVA_LOCAL):
try:
rpcapi.update_nova_local_aggregates(icontext, self._ihost_uuid)
except AttributeError:
# safe to ignore during upgrades
LOG.warn("Skip configuration of nova-local aggregates. "
"Upgrade in progress?")
self.platform_update_by_host(rpcapi,
icontext,
self._ihost_uuid,

6
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -610,12 +610,6 @@ CONTROLLER_AUDIT_REQUESTS = [DISK_AUDIT_REQUEST,
PV_AUDIT_REQUEST,
PARTITION_AUDIT_REQUEST]
# Storage: Host Aggregates Groups
HOST_AGG_NAME_REMOTE = 'remote_storage_hosts'
HOST_AGG_META_REMOTE = 'remote'
HOST_AGG_NAME_LOCAL_IMAGE = 'local_storage_image_hosts'
HOST_AGG_META_LOCAL_IMAGE = 'local_image'
# Interface definitions
NETWORK_TYPE_NONE = 'none'
NETWORK_TYPE_INFRA = 'infra'

9
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -4347,15 +4347,6 @@ class ConductorManager(service.PeriodicService):
config_uuid = imsg_dict['config_applied']
self._update_host_config_applied(context, ihost, config_uuid)
def update_nova_local_aggregates(self, context, ihost_uuid):
"""Synchronously, have a conductor configure nova_local for an ihost.
:param context: request context.
:param ihost_uuid: ihost uuid
"""
if not utils.is_kubernetes_config(self.dbapi):
self._openstack.update_nova_local_aggregates(ihost_uuid)
def subfunctions_update_by_ihost(self, context,
ihost_uuid, subfunctions):
"""Update subfunctions for a host.

170
sysinv/sysinv/sysinv/sysinv/conductor/openstack.py
View File

@ -17,7 +17,6 @@ from sysinv.common import constants
from sysinv.common import exception
from sysinv.common.storage_backend_conf import StorageBackendConfig
from sysinv.openstack.common.gettextutils import _
from sysinv.openstack.common import lockutils
from sysinv.openstack.common import log as logging
from novaclient.v2 import client as nova_client_v2
from neutronclient.v2_0 import client as neutron_client_v2_0
@ -305,152 +304,6 @@ class OpenStackOperator(object):
return interfaces
@lockutils.synchronized('update_nova_local_aggregates', 'sysinv-')
def update_nova_local_aggregates(self, ihost_uuid, aggregates=None):
"""
Update nova_local aggregates for a host
"""
availability_zone = None
if not aggregates:
try:
aggregates = self._get_novaclient().aggregates.list()
except Exception:
self.nova_client = None # password may have updated
aggregates = self._get_novaclient().aggregates.list()
nova_aggset_provider = set()
for aggregate in aggregates:
nova_aggset_provider.add(aggregate.name)
aggset_storage = set([
constants.HOST_AGG_NAME_LOCAL_IMAGE,
constants.HOST_AGG_NAME_REMOTE])
agglist_missing = list(aggset_storage - nova_aggset_provider)
LOG.debug("AGG Storage agglist_missing = %s." % agglist_missing)
# Only add the ones that don't exist
for agg_name in agglist_missing:
# Create the aggregate
try:
aggregate = self._get_novaclient().aggregates.create(
agg_name, availability_zone)
LOG.info("AGG-AS Storage aggregate= %s created. " % (
aggregate))
except Exception:
LOG.error("AGG-AS EXCEPTION Storage aggregate "
"agg_name=%s not created" % (agg_name))
raise
# Add the metadata
try:
if agg_name == constants.HOST_AGG_NAME_LOCAL_IMAGE:
metadata = {'storage': constants.HOST_AGG_META_LOCAL_IMAGE}
else:
metadata = {'storage': constants.HOST_AGG_META_REMOTE}
LOG.debug("AGG-AS storage aggregate metadata = %s." % metadata)
aggregate = self._get_novaclient().aggregates.set_metadata(
aggregate.id, metadata)
except Exception:
LOG.error("AGG-AS EXCEPTION Storage aggregate "
"=%s metadata not added" % aggregate)
raise
# refresh the aggregate list
try:
aggregates = dict([(agg.name, agg) for agg in
self._get_novaclient().aggregates.list()])
except Exception:
self.nova_client = None # password may have updated
aggregates = dict([(agg.name, agg) for agg in
self._get_novaclient().aggregates.list()])
# Add the host to the local or remote aggregate group
# determine if this host is configured for local storage
host_has_lvg = False
lvg_backing = False
try:
ilvgs = self.dbapi.ilvg_get_by_ihost(ihost_uuid)
for lvg in ilvgs:
if lvg.lvm_vg_name == constants.LVG_NOVA_LOCAL and \
lvg.vg_state == constants.PROVISIONED:
host_has_lvg = True
lvg_backing = lvg.capabilities.get(
constants.LVG_NOVA_PARAM_BACKING)
break
else:
LOG.debug("AGG-AS Found LVG %s with state %s "
"for host %s." % (
lvg.lvm_vg_name,
lvg.vg_state,
ihost_uuid))
except Exception:
LOG.error("AGG-AS ilvg_get_by_ihost failed "
"for %s." % ihost_uuid)
raise
LOG.debug("AGG-AS ihost (%s) %s in a local storage configuration." %
(ihost_uuid,
"is not"
if (lvg_backing == constants.LVG_NOVA_BACKING_REMOTE) else
"is"))
# Select the appropriate aggregate id based on the presence of an LVG
#
agg_add_to = ""
if host_has_lvg:
agg_add_to = {
constants.LVG_NOVA_BACKING_IMAGE:
constants.HOST_AGG_NAME_LOCAL_IMAGE,
constants.LVG_NOVA_BACKING_REMOTE:
constants.HOST_AGG_NAME_REMOTE
}.get(lvg_backing)
if not agg_add_to:
LOG.error("The nova-local LVG for host: %s has an invalid "
"instance backing: " % ihost_uuid)
ihost = self.dbapi.ihost_get(ihost_uuid)
for aggregate in aggregates.values():
if aggregate.name not in aggset_storage \
or aggregate.name == agg_add_to:
continue
if hasattr(aggregate, 'hosts') \
and ihost.hostname in aggregate.hosts:
try:
self._get_novaclient().aggregates.remove_host(
aggregate.id,
ihost.hostname)
LOG.info("AGG-AS remove ihost = %s from aggregate = %s." %
(ihost.hostname, aggregate.name))
except Exception:
LOG.error(("AGG-AS EXCEPTION remove ihost= %s "
"from aggregate = %s.") % (
ihost.hostname,
aggregate.name))
raise
else:
LOG.info("skip removing host=%s not in storage "
"aggregate id=%s" % (
ihost.hostname,
aggregate))
if hasattr(aggregates[agg_add_to], 'hosts') \
and ihost.hostname in aggregates[agg_add_to].hosts:
LOG.info(("skip adding host=%s already in storage "
"aggregate id=%s") % (
ihost.hostname,
agg_add_to))
else:
try:
self._get_novaclient().aggregates.add_host(
aggregates[agg_add_to].id, ihost.hostname)
LOG.info("AGG-AS add ihost = %s to aggregate = %s." % (
ihost.hostname, agg_add_to))
except Exception:
LOG.error("AGG-AS EXCEPTION add ihost= %s to aggregate = %s." %
(ihost.hostname, agg_add_to))
raise
def _get_interface_datanetworks(self, interface):
ifdatanets = self.dbapi.interface_datanetwork_get_by_interface(
interface.uuid)
@ -656,11 +509,6 @@ class OpenStackOperator(object):
else:
LOG.debug("AGG ihost_datanets empty %s." % ihost_uuid)
# setup the valid set of storage aggregates for host removal
aggset_storage = set([
constants.HOST_AGG_NAME_LOCAL_IMAGE,
constants.HOST_AGG_NAME_REMOTE])
# Remove aggregates from provider network. Anything with host in list.
# 4. nova aggregate-remove-host provider_physnet0 compute-0
# cs.aggregates.remove_host(aggregate.id, args.host)
@ -668,16 +516,14 @@ class OpenStackOperator(object):
ihost = self.dbapi.ihost_get(ihost_uuid)
for aggregate in aggregates:
if aggregate.name in ihost_datanets or \
aggregate.name in aggset_storage: # or just do it for all aggs
try:
LOG.debug("AGG10 remove aggregate id = %s ihost= %s." %
(aggregate.id, ihost.hostname))
self._get_novaclient().aggregates.remove_host(
aggregate.id, ihost.hostname)
except Exception:
LOG.debug("AGG10 EXCEPTION remove aggregate")
pass
try:
LOG.debug("AGG10 remove aggregate id = %s ihost= %s." %
(aggregate.id, ihost.hostname))
self._get_novaclient().aggregates.remove_host(
aggregate.id, ihost.hostname)
except Exception:
LOG.debug("AGG10 EXCEPTION remove aggregate")
pass
return True

10
sysinv/sysinv/sysinv/sysinv/conductor/rpcapi.py
View File

@ -161,16 +161,6 @@ class ConductorAPI(sysinv.openstack.common.rpc.proxy.RpcProxy):
self.make_msg('unconfigure_ihost',
ihost_obj=ihost_obj))
def update_nova_local_aggregates(self, context, ihost_uuid):
"""Synchronously, have a conductor configure nova_local for an ihost.
:param context: request context.
:param ihost_uuid: a host uuid.
"""
self.call(context,
self.make_msg('update_nova_local_aggregates',
ihost_uuid=ihost_uuid))
def create_controller_filesystems(self, context, rootfs_device):
"""Synchronously, create the controller file systems.