arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
John Simpson 2013-10-28 15:44:16 -04:00
commit abbbe735b5
9 changed files with 202 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-OpenStack/lib/perl/xCAT/Cloud.pm
View File

@ -128,7 +128,7 @@ sub getcloudres
my $clients = shift;
my $cloudres;
my $cloudlist;
my $repos;use Data::Dumper; print Dumper($cloudinfo_hash);
my $repos;
if( @$clients == 0 ) {
#This should not be a chef-server, and it's a chef-client
if( defined($cloudinfo_hash) && defined($cloudinfo_hash->{$node}) ) {

0
xCAT/postscripts/setup_openstack_repo → xCAT-OpenStack/postscripts/setup_openstack_repo
View File

4
xCAT-client/pods/man1/chkkitcomp.1.pod
View File

@ -10,7 +10,9 @@ B<chkkitcomp> [B<-V>|B<--verbose>] B<-i> I<osimage> I<kitcompname_list>
=head1 DESCRIPTION
The B<chkkitcomp> command will check if the kit components are compatible with the xCAT osimage. This command will if the kitcompname_list provided on the command line is compatible with the osimage.
The B<chkkitcomp> command will check if the kit components are compatible with the xCAT osimage.
This command will ignore the current osimage.kitcomponents setting, and just to check if the kitcompname list in the cmdline are compatible with the osimage by osversion/ostype/osarch/ and kit component dependencies.
Note: The xCAT support for Kits is only available for Linux operating systems.

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

@ -525,7 +525,7 @@ sub invoke_dodiscover {
if ($globalopt{service}) {
$services = $globalopt{service};
} else {
$services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE];
$services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE,SERVICE_IMM2];
}
#efix for hmc bug
if ($services =~ /hardware-management-console/) {
@ -1421,7 +1421,6 @@ sub xCATdB {
my $hidden = ($type =~ /bpa|fsp/)? 1:0;
my $groups = lc($type).",all";
my $tmp_pre = xCAT::data::ibmhwtypes::parse_group($model);
if (defined($tmp_pre)) {
$groups .= ",$tmp_pre";
}
@ -1504,7 +1503,6 @@ sub format_stanza {
if (defined($tmp_pre)) {
$groups .= ",$tmp_pre";
}
#################################
# Node attributes
@ -2099,3 +2097,5 @@ sub bt_handle_new_slp_entity {
$btresult{$mac} = $data;
}
1;

198
xCAT-server/lib/xcat/plugins/svc.pm
View File

@ -20,14 +20,113 @@ my %controllersessions;
sub handled_commands {
return {
mkstorage => "storage:type",
lsstorage => "storage:type",
detachstorage => "storage:type",
rmstorage => "storage:type",
lspool => "storage:type",
}
}
sub detachstorage {
my $request = shift;
my @nodes = @{$request->{node}};
my $controller;
@ARGV = @{$request->{arg}};
unless (GetOptions(
'controller=s' => \$controller,
)) {
foreach (@nodes) {
sendmsg([1,"Error parsing arguments"],$callback,$_);
}
}
my $storagetab = xCAT::Table->new('storage');
my $storents = $storagetab->getNodesAttribs(\@nodes, [qw/controller/]);
unless ($controller) {
$controller = assure_identical_table_values(\@nodes, $storents, 'controller');
}
my @volnames = @ARGV;
my $wwns = get_wwns(@nodes);
use Data::Dumper;
my %namemap = makehosts($wwns, controller=>$controller, cfg=>$storents);
foreach my $node (keys %namemap) {
my $host = $namemap{$node};
my $session = establish_session(controller=>$controller);
foreach my $volname (@volnames) {
my @rets = $session->cmd("rmvdiskhostmap -host $host $volname");
my $ret = $rets[0];
if ($ret =~ m/^CMMVC5842E/) {
sendmsg([1,"Node not attached to $volname"],$callback,$node);
}
}
}
}
sub rmstorage {
my $request = shift;
my @nodes = @{$request->{node}};
my $controller;
@ARGV = @{$request->{arg}};
unless (GetOptions(
'controller=s' => \$controller,
)) {
foreach (@nodes) {
sendmsg([1,"Error parsing arguments"],$callback,$_);
}
}
my @volnames = @ARGV;
my $storagetab = xCAT::Table->new('storage');
my $storents = $storagetab->getNodesAttribs(\@nodes, [qw/controller/]);
unless ($controller) {
$controller = assure_identical_table_values(\@nodes, $storents, 'controller');
}
detachstorage($request);
my $session = establish_session(controller=>$controller);
foreach my $volname (@volnames) {
my @info = $session->cmd("rmvdisk $volname");
my $ret = $info[0];
if ($ret =~ m/^CMMVC5753E/) {
foreach my $node (@nodes) {
sendmsg([1,"Disk $volname does not exist"], $callback, @nodes);
}
} elsif ($ret =~ m/^CMMVC5840E/) {
foreach my $node (@nodes) {
sendmsg([1,"Disk $volname is mapped to other nodes and/or busy"], $callback, @nodes);
}
}
}
}
sub lsstorage {
my $request = shift;
my @nodes = @{$request->{node}};
my $storagetab = xCAT::Table->new("storage",-create=>0);
unless ($storagetab) { return; }
my $storents = $storagetab->getNodesAttribs(\@nodes,[qw/controller/]);
my $wwns = get_wwns(@nodes);
foreach my $node (@nodes) {
if ($storents and $storents->{$node} and $storents->{$node}->[0]->{controller}) {
my $ctls = $storents->{$node}->[0]->{controller};
foreach my $ctl (split /,/, $ctls) { # TODO: scan all controllers at once
my $session = establish_session(controller=>$ctl);
my %namemap = makehosts($wwns, controller=>$ctl, cfg=>$storents);
my @vdisks = hashifyoutput($session->cmd("lsvdisk -delim :"));
foreach my $vdisk (@vdisks) {
my @maps = hashifyoutput($session->cmd("lsvdiskhostmap -delim : ".$vdisk->{'id'}));
foreach my $map (@maps) {
if ($map->{host_name} eq $namemap{$node}) {
sendmsg($vdisk->{name}.': size: '.$vdisk->{capacity}.' id: '.$vdisk->{vdisk_UID},$callback,$node);
last;
}
}
}
}
}
}
}
sub mkstorage {
my $request = shift;
my $ctx = shift;
my @nodes = @{$request->{node}};
my $shared = 0;
my $controller;
@ -37,12 +136,14 @@ sub mkstorage {
unless (ref $request->{arg}) {
die "TODO: usage";
}
my $name;
@ARGV = @{$request->{arg}};
unless (GetOptions(
'shared' => \$shared,
'controller=s' => \$controller,
'boot' => \$boot,
'size=f' => \$size,
'name=s' => \$name,
'pool=s' => \$pool,
)) {
foreach (@nodes) {
@ -74,14 +175,18 @@ sub mkstorage {
unless (defined $pool and defined $controller) {
return;
}
my $lun = create_lun(controller=>$controller, size=>$size, pool=>$pool);
my %lunargs = (controller=>$controller, size=>$size, pool=>$pool);
if ($name) { $lunargs{name} = $name; }
my $lun = create_lun(%lunargs);
sendmsg($lun->{name}.": id: ".$lun->{wwn},$callback);
my $wwns = get_wwns(@nodes);
makehosts($wwns, controller=>$controller, cfg=>$storents);
bindhosts(\@nodes, $lun, controller=>$controller);
my %namemap = makehosts($wwns, controller=>$controller, cfg=>$storents);
my @names = values %namemap;
bindhosts(\@names, $lun, controller=>$controller);
} else {
foreach my $node (@nodes) {
mkstorage_single(node=>$node, size=>$size, pool=>$pool,
boot=>$boot, controller=>$controller,
boot=>$boot, name=>$name, controller=>$controller,
cfg=>$storents->{$node});
}
}
@ -115,15 +220,51 @@ sub bindhosts {
#TODO: get what failure looks like... somehow...
#I guess I could make something with mismatched name and see how it
#goes
$session->cmd("mkvdiskhostmap -host $node ".$lun->{id});
$session->cmd("mkvdiskhostmap -force -host $node ".$lun->{id});
}
}
sub fixup_host {
my $session = shift;
my $wwnlist = shift;
my @hosts = hashifyoutput($session->cmd("lshost -delim :"));
my %wwnmap;
my %hostmap;
foreach my $host (@hosts) {
my @hostd = $session->cmd("lshost -delim : ".$host->{name});
foreach my $hdatum (@hostd) {
if ($hdatum =~ m/^WWPN:(.*)$/) {
$wwnmap{$1} = $host->{name};
$hostmap{$host->{name}}->{$1} = 1;
}
}
}
my $name;
foreach my $wwn (@$wwnlist) {
$wwn =~ s/://g;
$wwn = uc($wwn);
if (defined $wwnmap{$wwn}) { # found the matching host
#we want to give the host all the ports that may be relevant
$name = $wwnmap{$wwn};
foreach my $mwwn (@$wwnlist) {
$mwwn =~ s/://g;
$mwwn = uc($mwwn);
if (not defined $hostmap{$name}->{$mwwn}) {
$session->cmd("addhostport -hbawwpn $mwwn -force $name");
}
}
return $name;
}
}
die "unable to find host to fixup";
}
sub makehosts {
my $wwnmap = shift;
my %args = @_;
my $session = establish_session(%args);
my $stortab = xCAT::Table->new('storage');
my %nodenamemap;
foreach my $node (keys %$wwnmap) {
my $wwnstr = "";
foreach my $wwn (@{$wwnmap->{$node}}) {
@ -134,7 +275,18 @@ sub makehosts {
#TODO: what if the given wwn exists, but *not* as the nodename we want
#the correct action is to look at hosts, see if one exists, and reuse,
#create, or warn depending
$session->cmd("mkhost -name $node -fcwwpn $wwnstr -force");
my @hostres = $session->cmd("mkhost -name $node -hbawwpn $wwnstr -force");
my $result = $hostres[0];
if ($result =~ m/^CMM/) { # we have some exceptional case....
if ($result =~ m/^CMMVC6035E/) { #duplicate name and/or wwn..
#need to finde the host and massage it to being viable
$nodenamemap{$node} = fixup_host($session, $wwnmap->{$node});
} else {
die $result." while trying to create host";
}
} else {
$nodenamemap{$node} = $node;
}
my @currentcontrollers = split /,/, $args{cfg}->{$node}->[0]->{controller};
if ($args{cfg}->{$node}->[0] and $args{cfg}->{$node}->[0]->{controller}) {
@currentcontrollers = split /,/, $args{cfg}->{$node}->[0]->{controller};
@ -148,6 +300,7 @@ sub makehosts {
my $ctrstring = join ",", @currentcontrollers;
$stortab->setNodeAttribs($node,{controller=>$ctrstring});
}
return %nodenamemap;
}
my %wwnmap;
@ -216,7 +369,11 @@ sub create_lun {
my $session = establish_session(%args);
my $pool = $args{pool};
my $size = $args{size};
my @result = $session->cmd("mkvdisk -iogrp io_grp0 -mdiskgrp $pool -size $size -unit gb");
my $cmd="mkvdisk -iogrp io_grp0 -mdiskgrp $pool -size $size -unit gb";
if ($args{name}) {
$cmd .= " -name ".$args{name};
}
my @result = $session->cmd($cmd);
if ($result[0] =~ m/Virtual Disk, id \[(\d*)\], successfully created/) {
my $diskid = $1;
my $name;
@ -246,7 +403,7 @@ sub assure_identical_table_values {
$callback, $node);
return undef;
}
my $currval = $storents->{$node}->{$attribute};
my $currval = $sent->{$attribute};
unless ($currval) {
sendmsg([1, "No $attribute in arguments or table"],
$callback, $node);
@ -258,6 +415,7 @@ sub assure_identical_table_values {
$callback, $node);
return undef;
}
if (not defined $lastval) { $lastval = $currval; }
}
return $lastval;
}
@ -287,14 +445,20 @@ sub mkstorage_single {
}
if (defined $args{controller}) {
$controller = $args{controller};
} elsif ($cfg->{controller}) {
$controller = $cfg->{controller};
} elsif ($cfg->[0]->{controller}) {
$controller = $cfg->[0]->{controller};
$controller =~ s/.*,//;
}
my $lun = create_lun(controller=>$controller, size=>$size, pool=>$pool);
my %lunargs = (controller=>$controller, size=>$size, pool=>$pool);
if ($args{name}) {
$lunargs{name} = $args{name}."-".$node;
}
my $lun = create_lun(%lunargs);
sendmsg($lun->{name}.": id: ".$lun->{wwn},$callback,$node);
my $wwns = get_wwns($node);
makehosts($wwns, controller=>$controller, cfg=>{$node=>$cfg});
bindhosts([$node], $lun, controller=>$controller);
my %namemap = makehosts($wwns, controller=>$controller, cfg=>{$node=>$cfg});
my @names = values %namemap;
bindhosts(\@names, $lun, controller=>$controller);
}
sub process_request {
@ -303,6 +467,12 @@ sub process_request {
$dorequest = shift;
if ($request->{command}->[0] eq 'mkstorage') {
mkstorage($request);
} elsif ($request->{command}->[0] eq 'lsstorage') {
lsstorage($request);
} elsif ($request->{command}->[0] eq 'rmstorage') {
rmstorage($request);
} elsif ($request->{command}->[0] eq 'detachstorage') {
detachstorage($request);
} elsif ($request->{command}->[0] eq 'lspool') {
lsmdiskgrp($request);
}

1
xCAT-server/share/xcat/install/esxi/hypervisor.tmpl
View File

@ -52,6 +52,7 @@ echo -e "<xcatrequest>\n<command>nextdestiny</command>\n</xcatrequest>" | /bin/o
chkconfig SSH on
chkconfig ESXShell on
esxcli system settings advanced set --int-value 0 --option /VMFS3/EnableBlockDelete
esxcli system settings advanced set --int-value 1 --option /UserVars/SuppressShellWarning
esxcli network ip set -e y
esxcli network firewall ruleset set -r DHCPv6 -e y
esxcli network firewall ruleset set -r sshServer -e y

1
xCAT-server/share/xcat/netboot/esxi/48.esxifixup
View File

@ -1,6 +1,7 @@
#!/bin/sh
#first off, let's ditch UNMAP, per vwmare's recall...
localcli system settings advanced set --int-value 0 --option /VMFS3/EnableBlockDelete
localcli system settings advanced set --int-value 1 --option /UserVars/SuppressShellWarning
#ok, now let's turn on some SSH and ESXShell fun
localcli network firewall ruleset set -r sshServer -e y
chkconfig ESXShell on

4
xCAT/postscripts/configeth
View File

@ -314,6 +314,10 @@ if [ "$str_os_type" = "linux" ];then
str_os_type="redhat"
str_cfg_dir="/etc/sysconfig/network-scripts/"
fi
else
echo "configeth dose not support AIX in this build"
exit 0
fi
logger -t xcat -p local4.err "configeth: os type: $str_os_type"

5
xCAT/postscripts/confignics
View File

@ -45,6 +45,11 @@ bool_cfg_inst_nic=0
str_inst_nic=''
str_ib_nics=''
str_os_type=`uname | tr 'A-Z' 'a-z'`
if [ "$str_os_type" = "aix" ];then
logger -t xcat -p local4.err "confignics: aix does not support in this build"
echo "confignics: aix does not support in this build"
exit 0
fi
bool_remove=0
num_iba_ports=
str_all_nics=''