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

Merge branch '2.8' of ssh://jjhua@git.code.sf.net/p/xcat/xcat-core into 2.8

Browse Source
This commit is contained in:
jjhua 2013-11-13 11:20:16 -05:00
commit d9e220238d
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-OpenStack/debian/dirs
View File

@ -8,3 +8,4 @@ opt/xcat/share/doc/man5
opt/xcat/share/man/man7
opt/xcat/share/doc/man7
install/postscripts
install/chef-cookbooks

1
xCAT-OpenStack/debian/install
View File

@ -8,3 +8,4 @@ share/doc/man5/* opt/xcat/share/doc/man5/
share/man/man7/* opt/xcat/share/man/man7/
share/doc/man7/* opt/xcat/share/doc/man7/
postscripts/* install/postscripts/
chef-cookbooks/* install/chef-cookbooks

1
xCAT-OpenStack/debian/rules
View File

@ -34,6 +34,7 @@ install:
chmod 644 `pwd`/debian/xcat-openstack/opt/xcat/share/man/man7/*
chmod 644 `pwd`/debian/xcat-openstack/opt/xcat/share/doc/man7/*
chmod 755 `pwd`/debian/xcat-openstack/install/postscripts/*
chmod 644 `pwd`/debian/xcat-openstack/install/chef-cookbooks/*
chmod 644 `pwd`/debian/xcat-openstack/opt/xcat/share/xcat/*
dh_link

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

@ -18,7 +18,7 @@ B<rflash> I<noderange> B<-p> I<directory> B<--activate> B<disruptive>|B<deferred
B<rflash> I<noderange> {B<--commit>|B<--recover>}
=head2 BMC (with FPC) specific:
=head2 NeXtScale FPC specific:
B<rflash> I<noderange> I<http directory>
@ -73,7 +73,7 @@ For Power 775, the rflash command takes effect on the primary and secondary FSPs
For more details about the Firmware Update using Direct FSP/BPA Management, refer to:
https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Power_775_Hardware_Management#Updating_the_BPA_and_FSP_firmware_using_xCAT_DFM
=head2 BMC (with NeXtScale FPC) specific:
=head2 NeXtScale FPC specific:
The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http imformation required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http. Refer to the link to get more details:
https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_NeXtScale_Clusters#Update_the_FPC_firmware_.28optional.29

3
xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd
View File

@ -13,5 +13,6 @@ R:rsync*
R:bash*
# using Perl 5.10.1
R:perl-Net_SSLeay.pm-1.30-3*
#R:perl-Net_SSLeay.pm-1.30-3* #used for AIX 7.1.2 and older
R:perl-Net_SSLeay.pm-1.55-3* #used for AIX 7.1.3 and above
R:perl-IO-Socket-SSL*

3
xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd
View File

@ -47,7 +47,8 @@ R:perl-Net-DNS*
R:perl-Net-IP*
R:perl-Net-Telnet*
R:perl-version-0.82-2*
R:perl-Net_SSLeay.pm-1.30-3*
#R:perl-Net_SSLeay.pm-1.30-3* #used for AIX 7.1.2 and older
R:perl-Net_SSLeay.pm-1.55-3* #used for AIX 7.1.3 and above
R:perl-IO-Socket-SSL*
R:unixODBC*

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

@ -186,7 +186,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm.legacy
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/nodediscover.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/switch.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm
@ -238,6 +237,7 @@ rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/esxi/48.esxifixup
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/esxi/xcatsplash
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/fedora*
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/imgutils
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/mic
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/rh
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/ol
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/xcat/devicetype
@ -255,7 +255,6 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/AAsn.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm.legacy
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/nodediscover.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/switch.pm
rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm

2
xCAT/postscripts/configeth
View File

@ -199,7 +199,7 @@ function add_ip_temporary(){
str_label=$str_nic_name
fi
str_bcase=$(calcbcase $str_ip $str_mask)
str_bcase=$(v4calcbcase $str_ip $str_mask)
#the label is ready, add the ip address directly
ip addr add $str_ip/${str_mask} broadcast $str_bcase dev $str_nic_name scope global label $str_label
fi