xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-07 02:38:15 +00:00
Code Issues Releases Wiki Activity

Make SNMP optional

Browse Source 
With cumulus switches and relatively rarer use of pdu plugin,
make the ever frustrating net-snmp-perl rpm dependency
optional rather than required.
This commit is contained in:
Jarrod Johnson
2020-08-13 08:10:37 -04:00
parent 9a8679f47e
commit 22a5b1862a
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
perl-xCAT/xCAT/MacMap.pm
View File

@@ -23,7 +23,12 @@ use Sys::Syslog;
#use Data::Dumper;
use POSIX qw/WNOHANG/;
use SNMP;
my $have_snmp = 1;
eval "use SNMP";
if ($@) {
$have_snmp = 0;
}
my %cisco_vlans; #Special hash structure to reflect discovered VLANS on Cisco equip
#use IF-MIB (1.3.6.1.2.1.2) for all switches

5
xCAT-server/lib/xcat/plugins/pdu.pm
View File

@@ -37,6 +37,11 @@ use Class::Struct;
use XML::Simple;
use Storable qw(dclone);
use SNMP;
my $have_snmp = 1;
eval "use SNMP";
if ($@) {
$have_snmp = 0;
}
use Expect;
use Net::Ping;

6
xCAT-server/lib/xcat/plugins/switchdiscover.pm
View File

@@ -21,7 +21,11 @@ no strict;
use Data::Dumper;
use Socket;
use Expect;
use SNMP;
my $have_snmp = 1;
eval "use SNMP";
if ($@) {
$have_snmp = 0;
}
use xCAT::data::switchinfo;
#global variables for this module

2
xCAT-server/xCAT-server.spec
View File

@@ -47,7 +47,7 @@ Obsoletes: atftp-xcat
%endif
%if "%{dist}" == ".el8"
Requires: perl-Time-HiRes perl-Sys-Syslog perl-Text-Balanced perl-DB_File perl-XML-LibXML perl-Expect net-snmp-perl perl-Net-DNS perl-Net-Ping perl-XML-LibXML-Simple
Requires: perl-Time-HiRes perl-Sys-Syslog perl-Text-Balanced perl-DB_File perl-XML-LibXML perl-Expect perl-Net-DNS perl-Net-Ping perl-XML-LibXML-Simple
%endif
# The aix rpm cmd forces us to do this outside of ifos type stmts