From c043368593db916d00ca06facc6d46cde35ac7f3 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Sat, 21 Mar 2009 13:54:13 +0000 Subject: [PATCH] - removed hard dependency on perl-SOAP-Lite - updated makedns man page - fixed buildcore.sh for xCATsn and xCAT rpms - added fping require in xCAT-client git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2954 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- buildcore.sh | 6 ++---- perl-xCAT/xCAT/vboxService.pm | 2 +- xCAT-client/pods/man8/makedns.8.pod | 16 ++++++++++++---- xCAT-client/xCAT-client.spec | 5 +++++ xCAT-server/lib/xcat/plugins/vbox.pm | 10 +++++++--- xCAT/xCAT.spec | 2 +- xCATsn/xCATsn.spec | 2 +- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index b6f45a72c..66e064cb7 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -87,7 +87,7 @@ if $GREP xCAT-nbroot ../coresvnup; then mv /usr/src/$pkg/RPMS/noarch/xCAT-nbroot-core-*rpm $DESTDIR mv /usr/src/$pkg/SRPMS/xCAT-nbroot-core-*rpm $SRCDIR fi -if $GREP "U xCATsn/" ../coresvnup || $GREP "A xCATsn/" ../coresvnup; then +if $GREP -E '^[UAD] +xCATsn/' ../coresvnup; then UPLOAD=1 rm -f $DESTDIR/xCATsn-$VER*rpm rm -f $SRCDIR/xCATsn-$VER*rpm @@ -96,12 +96,10 @@ if $GREP "U xCATsn/" ../coresvnup || $GREP "A xCATsn/" ../coresvnup; then mv /usr/src/$pkg/SRPMS/xCATsn-$VER*rpm $SRCDIR ./makexcatsnrpm i386 mv /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm $DESTDIR - mv /usr/src/$pkg/SRPMS/xCATsn-$VER*rpm $SRCDIR ./makexcatsnrpm ppc64 mv /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm $DESTDIR - mv /usr/src/$pkg/SRPMS/xCATsn-$VER*rpm $SRCDIR fi -if $GREP "U xCAT/" ../coresvnup || $GREP "A xCAT/" ../coresvnup; then +if $GREP -E '^[UAD] +xCAT/' ../coresvnup; then UPLOAD=1 rm -f $DESTDIR/xCAT-$VER*rpm rm -f $SRCDIR/xCAT-$VER*rpm diff --git a/perl-xCAT/xCAT/vboxService.pm b/perl-xCAT/xCAT/vboxService.pm index a3a6e36ad..606be99cd 100644 --- a/perl-xCAT/xCAT/vboxService.pm +++ b/perl-xCAT/xCAT/vboxService.pm @@ -3672,7 +3672,7 @@ IVirtualBox_createMachine => { }, # end IVirtualBox_createMachine ); # end my %methods -require SOAP::Lite; +#require SOAP::Lite; # vbox.pm requires SOAP::Lite before requiring vboxService.pm, so we can check for SOAP::Lite dynamically require Exporter; use Carp (); diff --git a/xCAT-client/pods/man8/makedns.8.pod b/xCAT-client/pods/man8/makedns.8.pod index 5a3ab8c02..c31952106 100644 --- a/xCAT-client/pods/man8/makedns.8.pod +++ b/xCAT-client/pods/man8/makedns.8.pod @@ -11,10 +11,18 @@ B [B<-h>|B<--help>] =head1 DESCRIPTION -B makes a DNS server from the /etc/hosts file entries. It also uses the following +B configures a DNS server on the local machine from the /etc/hosts file entries. It also uses the following attributes set in the B table as default values: B, B, B. The domain value can be overridden by the B<-d> option. -The netmasks from the B table will also be used if not overridden by the B<-n> option. +The netmasks from the B table will also be used if not overridden by the B<-n> option. Only entries in +/etc/hosts that are part of a network listed in the B table will be added to DNS. + +B can only handle hostnames from a single domain, normally a private domain just for the cluster. The +typical cluster set up is for site.domain to be set to the cluster domain, site.nameservers to be set to the +cluster-facing IP address of the management node, and site.forwarders to be set to the IP address of one or more +nameservers at your site that can resolve names outside of your cluster. With this set up, all nodes ask the +management node to resolve names, and if it is a name that the MN DNS does not know about, it will ask the outside +world. =head1 OPTIONS @@ -39,11 +47,11 @@ Boot file to use. =item B<-A> -Do aliases. +Write the address records, i.e. the hostname to IP address mappings. =item B<-M> -Do mx records. +Write the MX records, i.e. the additional aliases for a hostname. =item B<-w> diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec index 312062fda..758eb948a 100644 --- a/xCAT-client/xCAT-client.spec +++ b/xCAT-client/xCAT-client.spec @@ -19,6 +19,11 @@ BuildArch: noarch Provides: xCAT-client = %{version} +# fping is needed by pping (in case xCAT-client is installed by itself on a remote client) +%ifos linux +Requires: fping +%endif + %description xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, etc) helpful in administrating systems at scale, with particular attention paid to large HPC clusters. diff --git a/xCAT-server/lib/xcat/plugins/vbox.pm b/xCAT-server/lib/xcat/plugins/vbox.pm index cd1f43e30..4b58299ae 100644 --- a/xCAT-server/lib/xcat/plugins/vbox.pm +++ b/xCAT-server/lib/xcat/plugins/vbox.pm @@ -24,9 +24,6 @@ use Getopt::Long; use strict; use warnings; -require SOAP::Lite; -require xCAT::vboxService; - my $cmd = 'clienttest'; #------------------------------------------------------- @@ -103,6 +100,13 @@ sub process_request my $envs = $request->{env}; our $rsp; my $node; + + my $soapsupport = eval { require SOAP::Lite; }; + unless ($soapsupport) { #Still no SOAP::Lite module + $callback->({error=>"SOAP::Lite perl module missing, unable to fulfill Virtual Box plugin requirements",errorcode=>[42]}); + return []; + } +require xCAT::vboxService; my @nodes=@$nodes; diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 42964dedc..17fea2418 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -22,7 +22,7 @@ Requires: atftp dhcp httpd nfs-utils expect conserver fping bind perl-XML-Parser %endif %ifarch i386 i586 i686 x86 x86_64 -Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 syslinux perl-version perl-SOAP-Lite +Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 syslinux Requires: ipmitool >= 1.8.9 %endif diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index ac4792477..793051d88 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -27,7 +27,7 @@ Requires: ipmitool >= 1.8.9 %description xCATsn is a service node management package intended for at-scale management, -including hardware management and software management. +including hardware management and software management. %prep