From fd2055c51c9c48475df9aac35e7882ff52344bb8 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Wed, 28 May 2014 10:27:41 -0400 Subject: [PATCH 1/5] defect 4079: to support rh7 that hostname is cfged in /etc/hostname. Check the existence of /etc/hostname, use itif yes, otherwise use /etc/sysconfig/network --- .../xcat/openstack/postscripts/config_ops_bm_node | 4 ++-- .../xcat/openstack/postscripts/deconfig_ops_bm_node | 4 ++-- xCAT-server/share/xcat/hamn/deactivate-mn | 6 +++++- xCAT/postscripts/configeth | 12 ++++++++---- xCAT/postscripts/hardeths | 6 +++++- xCAT/postscripts/updatenetwork | 12 ++++++++---- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node index e516a138a..e67f48393 100755 --- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node +++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node @@ -100,8 +100,8 @@ change_host_name() if [ "$str_os_type" = "sles" ];then echo "Persistently changing the hostname not implemented yet." - #debian ubuntu - elif [ "$str_os_type" = "debian" ];then + #debian ubuntu and rh7 + elif [ -f "/etc/hostname" ];then conf_file="/etc/hostname" echo "$str_hostname" > $conf_file else diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node index da148f47e..81ef22564 100755 --- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node +++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node @@ -36,8 +36,8 @@ change_host_name() if [ "$str_os_type" = "sles" ];then echo "Persistently changing the hostname not implemented yet." - #debian ubuntu - elif [ "$str_os_type" = "debian" ];then + #debian ubuntu and rh7 + elif [ -f "/etc/hostname" ];then conf_file="/etc/hostname" echo "$str_hostname" > $conf_file else diff --git a/xCAT-server/share/xcat/hamn/deactivate-mn b/xCAT-server/share/xcat/hamn/deactivate-mn index da2f19dd2..9a4ab6ddf 100755 --- a/xCAT-server/share/xcat/hamn/deactivate-mn +++ b/xCAT-server/share/xcat/hamn/deactivate-mn @@ -251,7 +251,11 @@ then then BOOT_HOSTNAME=$(lsattr -El inet0 -a hostname | awk '{print $2}') else # Linux - BOOT_HOSTNAME=`grep HOSTNAME /etc/sysconfig/network | cut -f 2 -d "="` + if [ -f "/etc/hostname" ]; then + BOOT_HOSTNAME=`cat /etc/hostname` + else + BOOT_HOSTNAME=`grep HOSTNAME /etc/sysconfig/network | cut -f 2 -d "="` + fi fi hostname ${BOOT_HOSTNAME} fi diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index 85994e869..247257b84 100755 --- a/xCAT/postscripts/configeth +++ b/xCAT/postscripts/configeth @@ -392,11 +392,15 @@ elif [ "$1" = "-s" ];then fi fi hostname $NODE - grep -i "HOSTNAME" /etc/sysconfig/network - if [ $? -eq 0 ];then - sed -i "s/.*HOSTNAME.*/HOSTNAME=${NODE}/i" /etc/sysconfig/network + if [ -f "/etc/hostname" ]; then + echo $NODE > /etc/hostname else - echo "HOSTNAME=${NODE}" >> /etc/sysconfig/network + grep -i "HOSTNAME" /etc/sysconfig/network + if [ $? -eq 0 ];then + sed -i "s/.*HOSTNAME.*/HOSTNAME=${NODE}/i" /etc/sysconfig/network + else + echo "HOSTNAME=${NODE}" >> /etc/sysconfig/network + fi fi fi exit 0 diff --git a/xCAT/postscripts/hardeths b/xCAT/postscripts/hardeths index b29e2953c..f3f8b2236 100755 --- a/xCAT/postscripts/hardeths +++ b/xCAT/postscripts/hardeths @@ -63,7 +63,11 @@ then else #RedHat uses /etc/sysconfig/network-scripts/ifcfg-eth NICFILEPRE="/etc/sysconfig/network-scripts/ifcfg-" - sed -i "s/HOSTNAME.*/HOSTNAME=`hostname`/" /etc/sysconfig/network + if [ -f "/etc/hostname" ]; then # for rh7 + echo `hostname` >/etc/hostname + else + sed -i "s/HOSTNAME.*/HOSTNAME=`hostname`/" /etc/sysconfig/network + fi if [ ! -z "$defgw" ]; then echo "GATEWAY=$defgw" >> /etc/sysconfig/network fi diff --git a/xCAT/postscripts/updatenetwork b/xCAT/postscripts/updatenetwork index d1bcd6a4c..8da573914 100644 --- a/xCAT/postscripts/updatenetwork +++ b/xCAT/postscripts/updatenetwork @@ -16,11 +16,15 @@ device_names=`ip link |grep "BROADCAST" |awk '{print $2}' | sed s/://` str_cfg_file='' if [ -d "/etc/sysconfig/network-scripts/" ];then #redhat - grep -i HOSTNAME /etc/sysconfig/network - if [ $? -eq 0 ];then - sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" /etc/sysconfig/network + if [ -f "/etc/hostname" ]; then #RH7 + echo $HOSTNAME > /etc/hostname else - echo "HOSTNAME=$HOSTNAME" >> /etc/sysconfig/network + grep -i HOSTNAME /etc/sysconfig/network + if [ $? -eq 0 ];then + sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" /etc/sysconfig/network + else + echo "HOSTNAME=$HOSTNAME" >> /etc/sysconfig/network + fi fi for i in $device_names;do str_cfg_file="/etc/sysconfig/network-scripts/ifcfg-$i" From de8815cb0b60f7701ef744a07e0d6d4d9cf8c907 Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 28 May 2014 10:07:07 -0400 Subject: [PATCH 2/5] defect 4091 RHEL7 support --- xCAT-server/share/xcat/tools/detect_dhcpd | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/tools/detect_dhcpd b/xCAT-server/share/xcat/tools/detect_dhcpd index d696a66eb..78d33e19f 100755 --- a/xCAT-server/share/xcat/tools/detect_dhcpd +++ b/xCAT-server/share/xcat/tools/detect_dhcpd @@ -39,12 +39,19 @@ my $start = Time::HiRes::gettimeofday(); $start =~ s/(\d.*)\.(\d.*)/$1/; if (!$nic) { print "specify a nic\n"; print $::USAGE; exit 1;} -my $IP = `ifconfig $nic | grep "inet addr" | awk '{print \$2}' | awk -F: '{print \$2}'`; +#my $IP = `ifconfig $nic | grep "inet addr" | awk '{print \$2}' | awk -F: '{print \$2}'`; +my $IPADDRMASK = `ip addr show dev $nic | grep inet | grep -v inet6 | awk '{print \$2}' | head -n 1`; +my ($IP,$MASK)= split (/\//,$IPADDRMASK); my $MAC; +my $tmpMAC; +my @ipoutput; if ($::MACADD) { $MAC = $::MACADD; } else { - $MAC = `ifconfig $nic | grep "HWaddr" | /usr/bin/awk '{print \$5}'`; +# $MAC = `ifconfig $nic | grep "HWaddr" | /usr/bin/awk '{print \$5}'`; + $tmpMAC = `ip link show $nic | grep ether`; + @ipoutput= split (' ',$tmpMAC); + $MAC=$ipoutput[1]; } chomp($IP); From 1f8574c8fcafb86e0e52d0583b7bb558f6e7f46c Mon Sep 17 00:00:00 2001 From: Jia Zhao Date: Thu, 29 May 2014 11:02:03 +0800 Subject: [PATCH 3/5] support fuzzy matching mode in cfmsync --- perl-xCAT/xCAT/CFMUtils.pm | 127 ++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/CFMUtils.pm b/perl-xCAT/xCAT/CFMUtils.pm index 987cb0d65..314d3c4b9 100644 --- a/perl-xCAT/xCAT/CFMUtils.pm +++ b/perl-xCAT/xCAT/CFMUtils.pm @@ -500,6 +500,7 @@ sub setCFMPkglistFile { Arguments: $imagename - the specified linuximage name @curospkgs - the currently selected OS packages list + $mode - using Fuzzy Matching or Exact Matching to check packages Returns: 0 - update successfully 1 - update failed @@ -509,13 +510,22 @@ sub setCFMPkglistFile { none Example: my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs); + my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs, 1); =cut #----------------------------------------------------------------------------- sub updateCFMPkglistFile { - my ($class, $img, $ospkgs) = @_; - + my ($class, $img, $ospkgs, $mode) = @_; + + if(defined($mode)){ + # Exact Matching + $mode = 1; + }else { + # Fuzzy Matching + $mode = 0; + } + my @cur_selected = @$ospkgs; my $cfmpkglist = "/install/osimages/$img/pkglist.cfm"; @@ -549,6 +559,14 @@ sub updateCFMPkglistFile { my @selected = @$selected_ref; @basepkgs = xCAT::CFMUtils->arrayops("U", \@basepkgs, \@selected); } + + # Fuzzy Matching + if (not $mode){ + my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->updateSelectedPkgs(\@pre_selected, \@pre_removed, \@cur_selected); + @pre_selected = @$ref1; + @pre_removed = @$ref2; + @cur_selected = @$ref3; + } # get diff between previous and current selected OS packages lists my @diff = xCAT::CFMUtils->getPkgsDiff(\@pre_selected, \@cur_selected); @@ -661,6 +679,48 @@ sub getPreOSpkgsList { return (\@selected, \@removed); } +#----------------------------------------------------------------------------- + +=head3 getPreBaseOSpkgsList + Get previously selected and removed base OS packages lists from pkglist file. Packages named with "example.xxx" should be the base name "example" + + Arguments: + $ospkglist - the path for ospkglist file + Returns: + refs for selected and removed OS packages arrays + Globals: + none + Error: + none + Example: + my $pre_selected_ref = xCAT::CFMUtils->getPreOSpkgsList($ospkglist); + +=cut + +#----------------------------------------------------------------------------- +sub getPreBaseOSpkgsList { + my ($class, $pkglist) = @_; + + my ($pre_selected_ref, $pre_removed_ref) = xCAT::CFMUtils->getPreOSpkgsList($pkglist); + + my %pre_selected_hash = (); + foreach (@$pre_selected_ref) { + my @names = split(/\./, $_); + my $basename = $names[0]; + + if ($_ =~ /^$basename\.([^\.]+)$/) { + $pre_selected_hash{$basename} = 1; + }else { + $pre_selected_hash{$_} = 1; + } + } + + @pre_selected = keys %pre_selected_hash; + + return \@pre_selected; +} + + #----------------------------------------------------------------------------- =head3 getPkgsDiff @@ -819,3 +879,66 @@ sub arrayops { #return (\@union, \@intersection, \@difference); } + + +#----------------------------------------------------------------------------- + +=head3 updateSelectedPkgs + Update previous selected, previous removed and current selected packages based on fuzzy matching rules. Packages named with "example.i686" should be same with package "example" + + Arguments: + \@pre_selected - reference to previous selected packages + \@pre_removed - reference to previous removed packages + \@cur_selected - reference to current selected packages + Returns: + new previous selected, previous removed, current selected packages + Globals: + none + Error: + none + Example: + my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->arrayops(\@pre_selected, \@pre_removed, \@cur_selected); + +=cut + +#----------------------------------------------------------------------------- +sub updateSelectedPkgs() { + my ($class, $pre_selected_ref, $pre_removed_ref, $cur_selected_ref) = @_; + + my %pre_selected_hash = map{$_ => 1} @$pre_selected_ref; + my %pre_removed_hash = map{$_ => 1} @$pre_removed_ref; + my %cur_selected_hash = map{$_ => 1} @$cur_selected_ref; + + my %new_pre_selected_hash = %pre_selected_hash; + my %new_pre_removed_hash = %pre_removed_hash; + my %new_cur_selected_hash = %cur_selected_hash; + + foreach (keys %cur_selected_hash) { + my $father = $_; + my $flag = 0; + foreach (keys %pre_selected_hash) { + my $child = $_; + if ($child =~ /^$father\.([^\.]+)$/) { + $new_cur_selected_hash{$child} = 1; + $flag = 1; + } + } + if ($flag and not exists $pre_selected_hash{$father}){ + delete $new_cur_selected_hash{$father} if exists $new_cur_selected_hash{$father}; + } + + foreach (keys %pre_removed_hash) { + my $child = $_; + if ($child =~ /^$father\.([^\.]+)$/) { + delete $new_pre_removed_hash{$child} if exists $new_pre_removed_hash{$child}; + } + } + } + + my @new_cur_selected = keys %new_cur_selected_hash; + my @new_pre_selected = keys %new_pre_selected_hash; + my @new_pre_removed = keys %new_pre_removed_hash; + + + return (\@new_pre_selected, \@new_pre_removed, \@new_cur_selected); +} From 37ceb9fc132b72692309d848496e42588efc84c8 Mon Sep 17 00:00:00 2001 From: Jia Zhao Date: Thu, 29 May 2014 14:02:45 +0800 Subject: [PATCH 4/5] not regenerate ips for BMC/FSP NIC in pcm --- xCAT-server/lib/xcat/plugins/profilednodes.pm | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm index ae1a88826..4991a6fd7 100644 --- a/xCAT-server/lib/xcat/plugins/profilednodes.pm +++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm @@ -771,10 +771,30 @@ Usage: } # If network profile specified. Need re-generate IPs for all nodess again. + # As new design, ignore BMC/FSP NIC while reinstall nodes if(exists $args_dict{'networkprofile'}){ + my $newNetProfileName = $args_dict{'networkprofile'}; + my $oldNetProfileName = $nodeoldprofiles{'networkprofile'}; + + my $newNicsRef = xCAT::ProfiledNodeUtils->get_nodes_nic_attrs([$newNetProfileName])->{$newNetProfileName}; + my $oldNicsRef = xCAT::ProfiledNodeUtils->get_nodes_nic_attrs([$oldNetProfileName])->{$oldNetProfileName}; + + my %updateNicsHash = (); + foreach my $newNic (keys %$newNicsRef) { + if ($newNicsRef->{$newNic}->{'type'} ne 'BMC' and $newNicsRef->{$newNic}->{'type'} ne 'FSP'){ + $updateNicsHash{$newNic} = 1; + } + } + foreach my $oldNic (keys %$oldNicsRef) { + if ($oldNicsRef->{$oldNic}->{'type'} ne 'BMC' and $oldNicsRef->{$oldNic}->{'type'} ne 'FSP'){ + $updateNicsHash{$oldNic} = 1; + } + } + + my $updateNics = join(",", keys %updateNicsHash); setrsp_progress("Regenerate IP addresses for nodes..."); $retref = ""; - $retref = xCAT::Utils->runxcmd({command=>["noderegenips"], node=>$nodes, sequential=>[1]}, $request_command, 0, 2); + $retref = xCAT::Utils->runxcmd({command=>["noderegenips"], node=>$nodes, arg=>["nics=$updateNics"], sequential=>[1]}, $request_command, 0, 2); $retstrref = parse_runxcmd_ret($retref); if ($::RUNCMD_RC != 0){ setrsp_progress("Warning: failed to generate IPs for nodes."); @@ -843,6 +863,7 @@ Usage: $netProfileNicsRef = xCAT::ProfiledNodeUtils->get_nodes_nic_attrs([$netProfileName]); my $nicsref = $netProfileNicsRef->{$netProfileName}; my @nicslist = keys %$nicsref; + #3. validate specified nics if(exists $args_dict{'nics'}){ @updateNics = split(",", $args_dict{'nics'}); @@ -910,7 +931,9 @@ Usage: unless (grep {$_ eq $nicname} @updateNics){ # if the nic not specified, just keep the old IP&NIC record in nics table. my $oldip = $nodesNicsRef->{$node}->{$nicname}->{"ip"}; - $nicipsAttr{$node}{nicips} .= $nicname."!".$oldip.","; + if ($oldip) { + $nicipsAttr{$node}{nicips} .= $nicname."!".$oldip.","; + } }else{ my $ipsref = $freeIPsHash{$nicname}; my $nextip = shift @$ipsref; @@ -932,7 +955,7 @@ Usage: } } } - + #8. Update database. setrsp_progress("Updating database records..."); my $nicstab = xCAT::Table->new('nics',-create=>1); From 92aedad72732821bfba97b6da8407fb2605f3328 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Thu, 29 May 2014 07:29:24 -0400 Subject: [PATCH 5/5] defect 4144: to allow the recursion call for local named that the dns resolve request from other network is also allowed --- xCAT-server/lib/xcat/plugins/ddns.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm index 5d7f90473..ddda1a6a8 100755 --- a/xCAT-server/lib/xcat/plugins/ddns.pm +++ b/xCAT-server/lib/xcat/plugins/ddns.pm @@ -1009,6 +1009,7 @@ sub update_namedconf { push @newnamed,"options {\n"; unless ($slave && xCAT::Utils->isLinux()) { push @newnamed,"\tdirectory \"".$ctx->{zonesdir}."\";\n"; + push @newnamed, "\tallow-recursion { any; };\n"; } push @newnamed,"\t\t//listen-on-v6 { any; };\n"; if ($ctx->{forwarders}) {