diff --git a/xCAT-OpenStack/xCAT-OpenStack.spec b/xCAT-OpenStack/xCAT-OpenStack.spec index 21705e191..68d3da8f3 100644 --- a/xCAT-OpenStack/xCAT-OpenStack.spec +++ b/xCAT-OpenStack/xCAT-OpenStack.spec @@ -84,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT %files %{prefix} /install/postscripts +/install/chef-cookbooks %defattr(-,root,root) 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 diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm index 6516d25ad..f48297562 100644 --- a/xCAT-server/lib/xcat/plugins/ddns.pm +++ b/xCAT-server/lib/xcat/plugins/ddns.pm @@ -576,20 +576,13 @@ sub process_request { if (xCAT::Utils->isAIX()) { + #try to stop named my $cmd = "/usr/bin/stopsrc -s $service"; my @output=xCAT::Utils->runcmd($cmd, 0); - my $outp = join('', @output); - if ($::RUNCMD_RC != 0) - { - my $rsp = {}; - $rsp->{data}->[0] = "Command failed: $cmd. Error message: $outp.\n"; - xCAT::MsgUtils->message("E", $rsp, $callback); - return; - } $cmd = "/usr/bin/startsrc -s $service"; @output=xCAT::Utils->runcmd($cmd, 0); - $outp = join('', @output); + my $outp = join('', @output); if ($::RUNCMD_RC != 0) { my $rsp = {}; 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