diff --git a/xCAT/postscripts/servicenode b/xCAT/postscripts/servicenode index b45d118a6..e58d7a20c 100755 --- a/xCAT/postscripts/servicenode +++ b/xCAT/postscripts/servicenode @@ -56,6 +56,13 @@ chomp $::sdate; $::hname = `hostname`; chomp $::hname; +my $installdir = $ENV{'INSTALLDIR'}; +if (!$installdir) { + $installdir="/install"; +} +chomp $installdir; +$installdir =~ s/^(\'|\")(.*)(\"|\')$/$2/; # remove any surrounding quotes + # update security certificates keys for service node if ($ENV{UPDATESECURITY} && $ENV{UPDATESECURITY} eq "1") { $::servnode = $ENV{'MASTER'}; @@ -66,8 +73,8 @@ if ($ENV{UPDATESECURITY} && $ENV{UPDATESECURITY} eq "1") { } # copy the postscripts to /install/postscripts - if (&runcmd("mkdir -p /install/postscripts; cp -p -R /xcatpost/* /install/postscripts > /dev/null 2>&1") != 0 ) { - $msg = "$::sdate servicenode: Could not copy postscripts to /install/postscripts.\n"; + if (&runcmd("mkdir -p $installdir/postscripts; cp -p -R /xcatpost/* $installdir/postscripts > /dev/null 2>&1") != 0 ) { + $msg = "$::sdate servicenode: Could not copy postscripts to $installdir/postscripts.\n"; `logger -t xcat $msg`; } @@ -167,15 +174,15 @@ sub setupAIXsn } # copy the postscripts to /install/postscripts - if (&runcmd("mkdir -p /install/postscripts; cp -p -R /xcatpost/* /install/postscripts > /dev/null 2>&1") != 0 ) { - $msg = "$::sdate servicenode: Could not copy postscripts to /install/postscripts.\n"; + if (&runcmd("mkdir -p $installdir/postscripts; cp -p -R /xcatpost/* $installdir/postscripts > /dev/null 2>&1") != 0 ) { + $msg = "$::sdate servicenode: Could not copy postscripts to $installdir/postscripts.\n"; `logger -t xcat $msg`; } # check if /install/postscripts is in /etc/exports - if (&runcmd("/bin/cat /etc/exports | grep '/install/postscripts ' >/dev/null 2>&1") != 0) { + if (&runcmd("/bin/cat /etc/exports | grep '$installdir/postscripts ' >/dev/null 2>&1") != 0) { # if not add it and make sure it is exported - if (&runcmd("echo '/install/postscripts -ro' >> /etc/exports; exportfs -a") !=0 ) { + if (&runcmd("echo '$installdir/postscripts -ro' >> /etc/exports; exportfs -a") !=0 ) { $msg = "$::sdate servicenode: Could not update the /etc/exports file.\n"; `logger -t xcat $msg`; } diff --git a/xCAT/postscripts/xcataixpost b/xCAT/postscripts/xcataixpost index 96a7523be..52b965c27 100755 --- a/xCAT/postscripts/xcataixpost +++ b/xCAT/postscripts/xcataixpost @@ -144,6 +144,28 @@ unless ($servnode) { exit 0; } +# request the xCAT postscript for this particular node +my $scriptname = "/xcatpost/myxcatpost_" . $::shorthost; +if (&getmypost != 0) { + print "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; +} + +# get the installdir to use +my $installdir; +if (-f $scriptname) { + # set the timezone + my $cmd = "cat $scriptname | grep 'INSTALLDIR='"; + &runcmd($cmd); + my $dline = $::outref; + my ($junk, $installdir) = split(/=/, $dline); + chomp $installdir; + $installdir =~ s/^(\'|\")(.*)(\"|\')$/$2/; # remove any surrounding quotes +} +if (!$installdir) { + $installdir = "/install"; +} + # if the /xcatpost dir has not been populated or the -c option is # specified then do the mount and copy of /install/postscripts if ( !(-f "/xcatpost/xcataixpost") || $::opt_c ) { @@ -156,10 +178,10 @@ if ( !(-f "/xcatpost/xcataixpost") || $::opt_c ) { # get the contents of the /install/postscripts dir on the server # - mount dir from server and copy files - my $mcmd = "mkdir -p /xcatmnt; mount $servnode:/install/postscripts /xcatmnt"; + my $mcmd = "mkdir -p /xcatmnt; mount $servnode:$installdir/postscripts /xcatmnt"; if (&runcmd($mcmd) != 0) { - print "$::sdate xcataixpost: Could not mount /install/postscripts from $servnode.\n"; - print $::LOG_FILE "$::sdate xcataixpost: Could not mount /install/postscripts from $servnode.\n"; + print "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n"; } my $cpcmd; @@ -179,20 +201,12 @@ if ( !(-f "/xcatpost/xcataixpost") || $::opt_c ) { my $ucmd = "umount /xcatmnt; rmdir /xcatmnt"; if (&runcmd($ucmd) != 0) { - print "$::sdate xcataixpost: Could not unmount /install.\n"; - print $::LOG_FILE "$::sdate xcataixpost: Could not unmount /install/postscripts.\n"; + print "$::sdate xcataixpost: Could not unmount $installdir.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not unmount $installdir/postscripts.\n"; } } # end recopy postscripts - -# request the xCAT postscript for this particular node -$scriptname = "/xcatpost/myxcatpost_" . $::shorthost; -if (&getmypost != 0) { - print "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; - print $::LOG_FILE "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; -} - # make sure all are executable my $chcmd = "chmod +x /xcatpost/*"; if (&runcmd($chcmd) != 0) { diff --git a/xCAT/postscripts/xcataixscript b/xCAT/postscripts/xcataixscript index 74cbee4d6..ddafbf0bf 100644 --- a/xCAT/postscripts/xcataixscript +++ b/xCAT/postscripts/xcataixscript @@ -6,7 +6,20 @@ # ##################################################### +# if AIX - make sure we include perl 5.8.2 in INC path. +# Needed to find perl dependencies shipped in deps tarball. +if ($^O =~ /^aix/i) { + use lib "/usr/opt/perl5/lib/5.8.2/aix-thread-multi"; + use lib "/usr/opt/perl5/lib/5.8.2"; + use lib "/usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi"; + use lib "/usr/opt/perl5/lib/site_perl/5.8.2"; +} + use File::Path; +use IO::Socket; +my $useSocketSSL=eval { require IO::Socket::SSL; }; +use Getopt::Long; +use XML::Simple; # since we don't have syslog set up yet we'll # just save msgs in a local log file @@ -57,12 +70,37 @@ if (&runcmd($cmd) != 0) { print $::LOG_FILE "$::sdate xcataixpost: Could not make the /xcatpost directory.\n"; } -# get the contents of the /install/postscripts dir on the server +# need to find out what dir to mount - so need to get INSTALLDIR attribute +# from the node-specific script +# request the xCAT postscript for this particular node +$scriptname = "/xcatpost/myxcatpost_" . $::shorthost; +if (&getmypost != 0) { + print "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not get the xCAT post script for this node.\n"; +} + +my $installdir; +if (-f $scriptname) { + my $cmd = "cat $scriptname | grep 'INSTALLDIR='"; + &runcmd($cmd); + my $Sline = $::outref; + my $junk; + ($junk, $installdir) = split(/=/, $Sline); + chomp $installdir; + $installdir =~ s/^\s*//; + $installdir =~ s/^(\'|\")(.*)(\"|\')$/$2/; # remove any surrounding quotes +} + +if (!$installdir) { + $installdir="/install"; +} + +# get the contents of the $installdir/postscripts dir on the server # - mount dir from server and copy files -my $mcmd = "mkdir -p /xcatmnt; mount -o nolock $servnode:/install/postscripts /xcatmnt"; +my $mcmd = "mkdir -p /xcatmnt; mount -o nolock $servnode:$installdir/postscripts /xcatmnt"; if (&runcmd($mcmd) != 0) { - print "$::sdate xcataixpost: Could not mount /install/postscripts from $servnode.\n"; - print $::LOG_FILE "$::sdate xcataixpost: Could not mount /install/postscripts from $servnode.\n"; + print "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not mount $installdir/postscripts from $servnode.\n"; } my $cpcmd; @@ -88,8 +126,8 @@ if (&runcmd($chcmd) != 0) { my $ucmd = "umount /xcatmnt; rmdir /xcatmnt"; if (&runcmd($ucmd) != 0) { - print "$::sdate xcataixpost: Could not unmount /install.\n"; - print $::LOG_FILE "$::sdate xcataixpost: Could not unmount /install/postscripts.\n"; + print "$::sdate xcataixpost: Could not unmount $installdir.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not unmount $installdir/postscripts.\n"; } # add xcatd to /etc/inittab??? @@ -108,6 +146,74 @@ close($::LOG_FILE); exit 0; +##################################################### +# +# getmypost +# Get the xCAT post script info for this node +# and write it to a file +# +##################################################### +sub getmypost { + + my $port = "3001"; + + # open a socket to request credentials + my $remote = IO::Socket::SSL->new( + PeerAddr => $servnode, + PeerPort => $port, + Proto => 'tcp', + ); + + unless ($remote) { + print "$::sdate xcataixpost: Cannot connect to host \'$servnode\'\n"; + print $::LOG_FILE "$::sdate xcataixpost: Cannot connect to host \'$servnode\'\n"; + return 1; + } + + if (!open(POSTSCRIPT, ">$scriptname") ) { + print "$::sdate xcataixpost: Could not open $scriptname.\n"; + print $::LOG_FILE "$::sdate xcataixpost: Could not open $scriptname.\n" +; + close $remote; + return 1; + } + # setup the perl library path for xcat-dep packages + # this is necessary for AIX 5.3V/61H and beyond + # but does not hurt old AIX versions + print POSTSCRIPT "PERL5LIB='/usr/opt/perl5/lib/5.8.2:/usr/opt/perl5/lib/5.8.2/aix-thread-multi:/usr/opt/perl5/lib/site_perl/5.8.2:/usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi'\n"; + print POSTSCRIPT "export PERL5LIB\n"; + + + # request must be in XML format + print $remote "\n"; + print $remote " getpostscript\n"; + print $remote "\n"; + + # get reponse in XML format + my $response=''; + my $rsp; + while (<$remote>) { + $response .= $_; + if ($response =~ m/<\/xcatresponse>/) { + $rsp = eval { XMLin($response,SuppressEmpty=>undef,ForceArray=>1) }; + + if ($rsp->{serverdone}) { + last; + } + + foreach my $line (@{$rsp->{data}}) { + $line =~ s/^\s+//; # strip any leading spaces + print POSTSCRIPT "$line"; + } + $response=''; + } + } + + close(POSTSCRIPT); + close $remote; + return 0; +} + ##################################################### # # run the command