From dd9b1b51ba204e834226c53bd9a2777d602c504a Mon Sep 17 00:00:00 2001 From: xq2005 Date: Tue, 12 Nov 2013 01:41:23 -0800 Subject: [PATCH 1/7] build xcat-openstack on ubuntu --- xCAT-OpenStack/debian/dirs | 1 + xCAT-OpenStack/debian/install | 1 + xCAT-OpenStack/debian/rules | 1 + 3 files changed, 3 insertions(+) diff --git a/xCAT-OpenStack/debian/dirs b/xCAT-OpenStack/debian/dirs index 69880dc33..e5493ed5c 100644 --- a/xCAT-OpenStack/debian/dirs +++ b/xCAT-OpenStack/debian/dirs @@ -8,3 +8,4 @@ opt/xcat/share/doc/man5 opt/xcat/share/man/man7 opt/xcat/share/doc/man7 install/postscripts +install/chef-cookbooks diff --git a/xCAT-OpenStack/debian/install b/xCAT-OpenStack/debian/install index 7d40ed7d9..4f94a5862 100644 --- a/xCAT-OpenStack/debian/install +++ b/xCAT-OpenStack/debian/install @@ -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 diff --git a/xCAT-OpenStack/debian/rules b/xCAT-OpenStack/debian/rules index 754b558a2..e2c95bcfb 100755 --- a/xCAT-OpenStack/debian/rules +++ b/xCAT-OpenStack/debian/rules @@ -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 From 369a9e9b1e8a4de8221ad1d42afabb0d5824de5b Mon Sep 17 00:00:00 2001 From: sjing Date: Tue, 12 Nov 2013 09:10:03 -0500 Subject: [PATCH 2/7] update perl-Net_SSLeay.pm to 1.55-3 for AIX7.1.3 and above --- xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd b/xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd index b5fa86b52..5606c8023 100644 --- a/xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd +++ b/xCAT-server/share/xcat/installp_bundles/xCATaixCN71.bnd @@ -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* From be04c5c8969ccadc41d5ec61e5ae14ee171141d7 Mon Sep 17 00:00:00 2001 From: sjing Date: Tue, 12 Nov 2013 09:27:36 -0500 Subject: [PATCH 3/7] update perl-Net_SSLeay.pm to 1.55-3 for AIX7.1.3 and above --- xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd b/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd index f7e0ccb16..8b3c41de3 100644 --- a/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd +++ b/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd @@ -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* From e868887a2911a789c1c248fb81396178a8d86c27 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Nov 2013 09:37:45 -0500 Subject: [PATCH 4/7] Remove ipmi.pm.legacy removal from fsm/zvm builds --- xCAT-server/xCAT-server.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index cbacec3c9..c3caa1d27 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -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 @@ -255,7 +254,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 From 77cea20b24fddcfcd7ef7e4aeade063b9bc3ed97 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Nov 2013 10:02:42 -0500 Subject: [PATCH 5/7] Fix problem where fsm pulled in mic support --- xCAT-server/xCAT-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index c3caa1d27..51a1421be 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -237,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 From e6a4b0d8fb6f48b4689a2c4df487a7ac2a08ba7a Mon Sep 17 00:00:00 2001 From: John Simpson Date: Tue, 12 Nov 2013 16:46:36 -0500 Subject: [PATCH 6/7] udpate to rflash man page for NeXtScale FPC --- xCAT-client/pods/man1/rflash.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod index bd8943362..8ea127c73 100644 --- a/xCAT-client/pods/man1/rflash.1.pod +++ b/xCAT-client/pods/man1/rflash.1.pod @@ -18,7 +18,7 @@ B I B<-p> I B<--activate> B|B I {B<--commit>|B<--recover>} -=head2 BMC (with FPC) specific: +=head2 NeXtScale FPC specific: B I I @@ -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 From 805adea8be0e92a11004a2ebf3f1866606806b36 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Tue, 12 Nov 2013 18:44:14 -0800 Subject: [PATCH 7/7] cacl broadcast address in configeth --- xCAT/postscripts/configeth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index 8ffb78c77..c9e73068c 100755 --- a/xCAT/postscripts/configeth +++ b/xCAT/postscripts/configeth @@ -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