starlingx/config
Code Issues Proposed changes

Merge "Fix sssd IPv6 address detection in DC system"

Browse Source
This commit is contained in:
Zuul 2022-11-10 16:37:51 +00:00 committed by Gerrit Code Review
commit 4113002522
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sysinv/sysinv/sysinv/sysinv/puppet/sssd.py
View File

@ -8,8 +8,6 @@ from oslo_log import log as logging
from sysinv.puppet import base from sysinv.puppet import base
from sysinv.common import constants from sysinv.common import constants
import netaddr
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -154,19 +152,12 @@ class SssdPuppet(base.BasePuppet):
return None return None
def _get_network_type(self): def _get_network_type(self):
if self._distributed_cloud_role() == \ return self.dbapi.network_get_by_type(constants.NETWORK_TYPE_MGMT)
constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
return self.dbapi.network_get_by_type(
constants.NETWORK_TYPE_SYSTEM_CONTROLLER)
else:
return self.dbapi.network_get_by_type(constants.NETWORK_TYPE_MGMT)
def _is_host_address_ipv6(self): def _is_host_address_ipv6(self):
addr_pool = self.dbapi.address_pool_get(self._get_network_type().pool_uuid) addr_pool = self.dbapi.address_pool_get(self._get_network_type().pool_uuid)
floating_addr = addr_pool.floating_address
addr = netaddr.IPAddress(floating_addr)
if addr.version == constants.IPV6_FAMILY: if addr_pool.family == constants.IPV6_FAMILY:
return True return True
else: else:
return False return False