2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-22 10:08:24 +00:00
Commit Graph

20235 Commits

Author SHA1 Message Date
Jarrod Johnson
e6bd554b66 Skip building non-x86, also fix the server build
For this branch, we don't build anything but x86.
Also, previous commit had a mistake in the path.
2017-06-30 10:04:41 -04:00
Jarrod Johnson
3cb6e44555 Mask out recent function with new requirements 2017-06-30 09:55:30 -04:00
Jarrod Johnson
77bab0ba0f Merge tag '2.13.5' into lenovobuild2.13 2017-06-30 08:47:25 -04:00
Bin Xu
1185459b21 Fix 3368, "noboot" is not working for mknb when multiple interfaces, and it is caused by something wrong in "get_nic_ip" (#3371) (#3372) 2.13.5 2017-06-29 04:36:36 -05:00
zet809
371527b38b Merge pull request #3364 from xcat2/master
Merge master to 2.13 branch for 2.13.5 release.(3)
2017-06-28 18:12:13 +08:00
xuweibj
6519d025c7 Merge pull request #3360 from zet809/enhance_bmcsetup_snoozelog
remove the log message "snooze for 1 second" in bmcsetup
2017-06-28 13:55:35 +08:00
ertaozh
554c35924e remove the log message "snooze for 1 second" in bmcsetup 2017-06-28 01:51:34 -04:00
zet809
77aa3b1bd5 Merge pull request #3357 from whowutwut/bmcconfig_msg
Improve the debug message when bmc value cannot be obtained from getbmcconfig
2017-06-28 09:26:56 +08:00
cxhong
df2f6a6cb5 Merge pull request #3311 from xuweibj/I3264
Modified judging condition of openbmc in bmcdiscover, if not open enter bmcdiscover_ipmi
2017-06-27 16:54:27 -04:00
Victor Hu
43ea6cc8d5 Merge pull request #3337 from gurevichmark/sinv_man
Fix formatting and grammar for sinv man page
2017-06-27 16:31:37 -04:00
Victor Hu
8818223af0 Improve the debug message when bmc value cannot be obtained
in the openbmc or ipmi table in xCAT
2017-06-27 16:14:00 -04:00
Jarrod Johnson
1a50b6bed6 Remove the PDU max outlet check
Walking all pdus prior to every PDU command is
too expensive.  Can revisit and improve if the error
is really worth it.
2017-06-27 15:43:06 -04:00
zet809
5f3e1659de Merge pull request #3354 from xcat2/master
Merge master to 2.13 branch for 2.13.5 release.(2)
2017-06-27 16:56:27 +08:00
zet809
ed8158f178 Merge pull request #3353 from zet809/fix_genessis_issue
The MAC is not got correct when doing hardware discovery
2017-06-27 16:52:41 +08:00
ertaozh
254fc0b151 The MAC is not got correct when doing hardware discovery 2017-06-27 04:35:54 -04:00
xuweibj
952a13529e Merge pull request #3351 from bybai/fixcf
fix testcase confignics aliases
2017-06-27 16:25:21 +08:00
bybai
ed07804a6b fix testcase confignics aliases 2017-06-27 03:58:33 -04:00
Mark Gurevich
664f63b8bf Fix formatting and grammar for sinv man page 2017-06-26 15:19:23 -04:00
zet809
8a452842c2 Merge pull request #3334 from xcat2/master
Merge master to 2.13 branch for 2.13.5 release
2017-06-26 17:11:17 +08:00
zet809
bb751ca468 Merge pull request #3333 from zet809/2.13
Deal with conflict between master and 2.13 branch for 2.13.5 release
2017-06-26 17:07:31 +08:00
ertaozh
14629a92e8 Deal with conflict between master and 2.13 branch for 2.13.5 release 2017-06-26 05:02:59 -04:00
zet809
911e092446 Merge pull request #3328 from xuweibj/I3327
Fix issue 3327, check environment of request type in openbmc and bmcdiscover
2017-06-26 16:59:00 +08:00
Yuan Bai
434e353a65 Merge pull request #3314 from chenglch/getadapter
Format the ouput of getadapter result
2017-06-26 14:21:46 +08:00
tingtli
df6963fc05 Merge pull request #3331 from bybai/slescfg
I have reviewed and agree to merge.
2017-06-26 14:19:06 +08:00
bybai
b2d434a22f fix sles11.4 testcase failure 2017-06-26 02:01:47 -04:00
XuWei
4176017b17 Fix issue 3327, check environment of request type in openbmc and bmcdiscover 2017-06-25 23:06:54 -04:00
Mark Gurevich
f4baff1e60 Merge pull request #3306 from whowutwut/rinv_firm_verbose
[openbmc] Add --verbose option and improve readability for `rinv <> firm`
2017-06-23 09:32:17 -04:00
yangsong
f5126227ce refine the PR 3268:support service node pool (#3323)
Fix the issue that grub2 config file is wrong when node.tftpserver="<xcatmaster>"
2017-06-23 16:18:03 +08:00
Yuan Bai
5cd9b632a1 refine new confignetwork framework to use configeth (#3302)
* new confignetwork framework to use configeth, it will be finally to replace confignics.

* updated based on comments
2017-06-23 14:45:13 +08:00
chenglch
62d5037975 Format the ouput of getadapter result
This patch format the result of getadapter command and update
the man page to notice that `getadapter` will boot into genesis.

Fix-issue: #3046
2017-06-23 02:32:58 -04:00
zet809
2679d56b73 Merge pull request #3129 from immarvin/oncumulusdiscover
ztp based cumulus discover and configuration
2017-06-23 13:49:51 +08:00
Yuan Bai
8901bb250b Merge pull request #3251 from tingtli/bug3214
[Need to verify]Add cases for bug 3214:  use confignetwork to do installnic and secondary nic ethernet configuration
2017-06-23 12:14:48 +08:00
litingt@cn.ibm.com
0e879470de update the return code 2017-06-23 00:05:47 -04:00
litingt@cn.ibm.com
d5290be664 update according to comments 2017-06-22 23:41:06 -04:00
zet809
3c8d85434b Merge pull request #3321 from whowutwut/bmcdiscover_fix
Use the boxelder/bmc information if inventory/system information is not found
2017-06-23 11:10:41 +08:00
Victor Hu
bc46643b73 Print the XCAT_DEV_WITHERSPOON bypass message out to the user 2017-06-22 23:08:15 -04:00
Victor Hu
32b467d635 Our p9 boxes do not have any VPD information, so in order to force
the code to return a generated discovered definition, blank out the mtm
string if XCAT_DEV_WITHERSPOON=TRUE
2017-06-22 22:49:02 -04:00
immarvin
65d882b990 add cumulus discover script 2017-06-22 22:30:35 -04:00
Victor Hu
c7aff42ca2 Modify the description for verbose option in rinv 2017-06-22 21:00:43 -04:00
Victor Hu
27607d7495 Add verbose option to rinv for OpenBMC supported machines 2017-06-22 20:58:20 -04:00
Victor Hu
b658a17af3 Change the output of firm [openbmc] to more closely match the output of
OPAL P8 machines when displaying the firmware.  Use the ID to sort, but
remove it when printing out the messages to the user
2017-06-22 20:57:10 -04:00
Victor Hu
8e90e30bac Add verbose option to be parsed by rinv [openbmc] 2017-06-22 20:57:10 -04:00
Victor Hu
eba16f3dd8 Found out that for Witherspoon machines, if the host has not been booted
there is no system information returned, so check for the boxelder bmc
for a model/serial combination to use
2017-06-22 20:39:27 -04:00
yangsong
6ed46ff77f support service node pool (#3268) 2017-06-22 18:04:55 +08:00
Weihua Hu
c94be14d08 Merge pull request #3317 from bybai/alias
fix confignics aliases related testcase
2017-06-22 17:52:54 +08:00
bybai
4456b52105 polished 2017-06-22 05:27:02 -04:00
bybai
0c74811424 polished 2017-06-22 05:17:35 -04:00
bybai
736725de21 fix 3242 2017-06-22 04:52:23 -04:00
zet809
11f351cf6e Merge pull request #2763 from samveen/reduce_greps
Reduce `grep` invocations by passing `-[46]` to `ip`
2017-06-22 16:24:04 +08:00
litingt@cn.ibm.com
9f09aacb53 update installnic files location and MTU 2017-06-22 02:25:33 -04:00