starlingx
/
config
Code Issues Proposed changes

Merge "Remove puppet entry related to host-based snmp"

This commit is contained in:
Zuul 2021-01-25 16:32:22 +00:00 committed by Gerrit Code Review
parent 447ee6e9f0 f4dc4a0c54
commit 94060c2b8b
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysinv/sysinv/sysinv/sysinv/puppet/fm.py
View File

@ -46,7 +46,6 @@ class FmPuppet(openstack.OpenstackBasePuppet):
def get_system_config(self):
ksuser = self._get_service_user_name(self.SERVICE_NAME)
system = self.dbapi.isystem_get_one()
trapdests = self.dbapi.itrapdest_get_list()
if utils.is_app_applied(self.dbapi, constants.HELM_APP_SNMP):
snmp_enabled_value = 1 # True
snmp_trap_server_port = self.get_snmp_trap_port()
@ -92,13 +91,6 @@ class FmPuppet(openstack.OpenstackBasePuppet):
self._to_create_services(),
}
if trapdests is not None:
trap_list = []
for e in trapdests:
trap_list.append(e.ip_address + ' ' + e.community)
config.update(
{'platform::fm::params::trap_destinations': trap_list})
return config
def get_secure_system_config(self):

31
sysinv/sysinv/sysinv/sysinv/puppet/platform.py
View File

@ -42,7 +42,6 @@ class PlatformPuppet(base.BasePuppet):
config.update(self._get_sm_config())
config.update(self._get_drbd_sync_config())
config.update(self._get_remotelogging_config())
config.update(self._get_snmp_config())
config.update(self._get_certificate_config())
config.update(self._get_systemcontroller_config())
return config
@ -844,36 +843,6 @@ class PlatformPuppet(base.BasePuppet):
remotelogging.transport,
}
def _get_snmp_config(self):
system = self.dbapi.isystem_get_one()
comm_strs = self.dbapi.icommunity_get_list()
trapdests = self.dbapi.itrapdest_get_list()
config = {
'platform::snmp::params::system_name':
system.name,
'platform::snmp::params::system_location':
system.location,
'platform::snmp::params::system_contact':
system.contact,
}
if comm_strs is not None:
comm_list = []
for i in comm_strs:
comm_list.append(i.community)
config.update({'platform::snmp::params::community_strings':
comm_list})
if trapdests is not None:
trap_list = []
for e in trapdests:
trap_list.append(e.ip_address + ' ' + e.community)
config.update({'platform::snmp::params::trap_destinations':
trap_list})
return config
def _get_certificate_config(self):
config = {}