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

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
Jarrod Johnson 2013-10-28 10:43:25 -04:00
commit 908efae0ba
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
xCAT/postscripts/setup_openstack_repo → xCAT-OpenStack/postscripts/setup_openstack_repo
View File

6
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -525,7 +525,7 @@ sub invoke_dodiscover {
if ($globalopt{service}) {
$services = $globalopt{service};
} else {
$services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE];
$services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE,SERVICE_IMM2];
}
#efix for hmc bug
if ($services =~ /hardware-management-console/) {
@ -1421,7 +1421,6 @@ sub xCATdB {
my $hidden = ($type =~ /bpa|fsp/)? 1:0;
my $groups = lc($type).",all";
my $tmp_pre = xCAT::data::ibmhwtypes::parse_group($model);
if (defined($tmp_pre)) {
$groups .= ",$tmp_pre";
}
@ -1504,7 +1503,6 @@ sub format_stanza {
if (defined($tmp_pre)) {
$groups .= ",$tmp_pre";
}
#################################
# Node attributes
@ -2099,3 +2097,5 @@ sub bt_handle_new_slp_entity {
$btresult{$mac} = $data;
}
1;

4
xCAT/postscripts/configeth
View File

@ -314,6 +314,10 @@ if [ "$str_os_type" = "linux" ];then
str_os_type="redhat"
str_cfg_dir="/etc/sysconfig/network-scripts/"
fi
else
echo "configeth dose not support AIX in this build"
exit 0
fi
logger -t xcat -p local4.err "configeth: os type: $str_os_type"

5
xCAT/postscripts/confignics
View File

@ -45,6 +45,11 @@ bool_cfg_inst_nic=0
str_inst_nic=''
str_ib_nics=''
str_os_type=`uname | tr 'A-Z' 'a-z'`
if [ "$str_os_type" = "aix" ];then
logger -t xcat -p local4.err "confignics: aix does not support in this build"
echo "confignics: aix does not support in this build"
exit 0
fi
bool_remove=0
num_iba_ports=
str_all_nics=''