2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00

21182 Commits

Author SHA1 Message Date
GONG Jie
2e66d5f7df Add %pretrans script in <lua>. Handle directory to symlink change properly. See comment #3 of https://bugs.launchpad.net/rpm/+bug/633636 2017-11-28 13:06:08 +08:00
Miro
aaacca80cd Fix merging in xdcpmerge.sh (#4328)
* Fixes in xdcpmerge.sh

Two fixes:
1. The grep pattern when finding duplicate usernames is missing ":" at the end. So, for example user "test" would also match "test2, etc.". Adding the ":" delimiter fixes the issue.
2. Another issue happens when the file to be merged is a superset of the files on the nodes. For example, if a new user is added and entire passwd file (that is otherwise identical) is sent to be merged. In this case, the $filebackup.nodups file, i.e. the original file with duplicates removed, becomes empty and the condition "if [ -s "$filebackup.nodups" ]" does not execute. Then the merged file ends up being original file with the merge file fully appended, clearly not what was intended.

This is solved by changing the condition to check for file existence "-a" rather then for size. Additionally, I also turn the logic around so that the duplicates are removed from the merge file and then added to the original file. I think this makes logic a bit cleaner and also ensures that existing entries are not reordered or changed in any way.

* Streamlining previous commit

Adjustment to previous commit, streamlining and simplifying logic. Once $mergefile.nodups is created, just concatenate it the original file.

* Update to xdcpmerge

No need to copy $filebackup to $curfile, they are the same.
2017-11-26 20:20:49 -06:00
zet809
80f587b7fc
Merge pull request #4326 from xuweibj/NT3339
Task 3339, rspconfig ip/netmask/gateway/vlan support
2017-11-24 16:07:20 +08:00
XuWei
58c9ebd95f modified depending on comments 2017-11-24 02:38:31 -05:00
yangsong
f5437609d4 do not set exit_code to 1 when the clock is not synced before the timeout (#4362) 2017-11-23 03:56:01 -06:00
Matt Ezell
ded43107e2 Fix 4363 - discovery broken (#4364) 2017-11-22 20:11:23 -06:00
zet809
ac30ab6ef7
Merge pull request #4357 from chenglch/rcons
Integrate congo console from goconserver with rcons
2017-11-23 10:05:11 +08:00
chenglch
ed181edb6c Integrate congo console from goconserver with rcons
Enhance the original implement of rcons to support goconserver.
`rcons` will help the user choose from one of the console backend
service based on the console server status of management node.

Implement #4216
2017-11-23 09:25:55 +08:00
cxhong
da7df78fd2 Add image name to /opt/xcat/xcatinfo on compute node (#4359) 2017-11-22 07:40:18 -06:00
xuweibj
6315852abd
Merge pull request #4351 from whowutwut/openbmc_rinv_indicator
[OpenBMC] Fix bug with rinv <> firm to display active firmware
2017-11-22 08:52:58 +08:00
cxhong
58c44c1e91
Merge pull request #4358 from mattaezell/4330_closesock
Fix #4330, close the socket
2017-11-21 10:34:55 -05:00
Matt Ezell
50fdcec19d Fix #4330, close the socket 2017-11-21 09:44:02 -05:00
Weihua Hu
27dea1a2a9 fix issue #4354 :The XCATTEST_CN in xcattest can not detect HCP as config file (#4355) 2017-11-21 02:23:00 -06:00
chenglch
323040a944
Merge pull request #4356 from xuweibj/I4338
Fix 4338, remove all of  in child process
2017-11-21 16:06:56 +08:00
XuWei
99faf3ff89 Fix 4338, remove all of in child process 2017-11-21 02:25:28 -05:00
Gᴏɴɢ Jie
a362033084
Merge pull request #4220 from samveen/fix_xhrm
Improve xHRM
2017-11-21 10:21:11 +08:00
Victor Hu
2c2748a548 Fix bug, anything in the functional array is the one that's really active, priority will not be 0 if there is pending firmware 2017-11-20 20:58:16 -05:00
cxhong
49252061f3
Merge pull request #4330 from mattaezell/openbmccons_fix
Use IO::Socket to check BMC console port
2017-11-20 14:03:11 -05:00
GONG Jie
488f3e8f2e Revise test case - switch_to_dns_forward_mode 2017-11-20 14:33:51 +08:00
Matt Ezell
d862891201 Use IO::Socket to check BMC console port 2017-11-18 14:54:04 -05:00
Victor Hu
23f2b1c864
Merge pull request #4322 from gurevichmark/openbmc_rflash_hash_mismatch
Verify hash ID before activating uploaded firmware
2017-11-17 15:28:47 -05:00
Mark Gurevich
9b7a8eccc7 Enhancements after the review 2017-11-17 11:50:45 -05:00
Weihua Hu
8805526bb8
Merge pull request #4319 from neo954/dns-forward-mode
Add test case - switch_to_dns_forward_mode
2017-11-17 17:55:16 +08:00
zet809
2cdd1d2724
Merge pull request #4296 from chenglch/goconserver
Add makegocons command
2017-11-17 17:45:58 +08:00
GONG Jie
1b1d008ea5 Revise test case - switch_to_dns_forward_mode 2017-11-17 17:31:47 +08:00
chenglch
071f336c17 Fix some bus in makegocons 2017-11-17 17:17:24 +08:00
zet809
be1dc2a6a9
Merge pull request #4320 from xuweibj/I4264
Modify timeout of login by curl command for OpenBMC
2017-11-17 17:09:49 +08:00
Yuan Bai
7d6712cf38 QA list for makehosts (#4284)
* QA list for makehosts
2017-11-17 01:46:13 -06:00
Yuan Bai
d895d63063
Merge pull request #4325 from robin2008/working
Put all required performance data into one report
2017-11-17 15:24:59 +08:00
XuWei
5ae2aadc5f modified depending on comments 2017-11-17 01:54:21 -05:00
Bin Xu
eba3e1f1f1 * Minor enhance on xcatperftest to put all logs into one file
* Fix a bug in simulatorctl.sh, and it cause the script cannot be found
2017-11-17 14:44:34 +08:00
XuWei
93eadce997 Task 3339, rspconfig ip/netmask/gateway/vlan support 2017-11-17 01:42:19 -05:00
zet809
be9116f5ff
Merge pull request #4289 from xuweibj/T4235
Task 4235, rspconfig BMC dump for OpenBMC
2017-11-17 14:12:04 +08:00
Samveen
b314b1eb3b natural_sort_cmp: recursion to iterative implementation (#4314)
* natural_sort_cmp: recursion to iterative implementation

* natural_sort_cmp: correct prototype with parameters, as per `man perlfunc`
2017-11-16 23:52:24 -06:00
zet809
a57d399e75
Merge pull request #4263 from jjohnson42/skipbmconreseat
Skip connection to BMC on rpower reseat
2017-11-17 11:14:46 +08:00
zet809
99884208c7
Merge pull request #4309 from cxhong/openbmccons
[openbmc]Do not send exec command to bmc console if bmc is not reachable
2017-11-17 11:12:30 +08:00
XuWei
80966800e2 modified depending on comments 2017-11-16 22:08:31 -05:00
zet809
f816d95799 enhance nodediscovery process: don't write "NOIP" if the node can not be resloved to an IP (#3995)
* enhance nodediscovery process, if only 1 mac and have \*NOIP\* append, don't write mac table and don't generate dhcp lease entry

* Enhance PR 3995: enhance nodediscovery process: don't write "NOIP" if the node can not be resloved to an IP
2017-11-16 21:07:45 -06:00
cxhong
6f53cf1a0b Timeout the ntpd process if ntpd service is not running on ntpserver (#4321) 2017-11-16 20:34:27 -06:00
Casandra Qiu
0b9aae5754 change log messages 2017-11-16 14:49:32 -05:00
Mark Gurevich
8ecd711c3d Verify hash ID 2017-11-16 13:37:16 -05:00
Mark Gurevich
b1b310b302
Merge pull request #4312 from whowutwut/unknown_purpose
[OpenBMC] Initialize variables to Unknown in loop incase BMC doesn't respond with values
2017-11-16 10:41:09 -05:00
zet809
b7385fa568 Modify the script to build xCAT-genesis-base package (#4292) 2017-11-16 04:20:38 -06:00
Victor Hu
c5bf988887 Refine the Cumulus Linux Section of the Doc (#4249)
* No content in the switches subdirectory in docs, remove

* Change the Network topic to Networking

* Refine and reformat the Cumulus Linux documentation
2017-11-16 03:56:29 -06:00
chenglch
abab9d89c5 Add makegocons command
This patch enable goconserver service and manage the node sessions
with a new `makegocons` command.

Implement: #4215
2017-11-16 17:56:26 +08:00
XuWei
fd8ba44039 Modify timeout of login by curl command for OpenBMC 2017-11-16 03:44:04 -05:00
GONG Jie
4788a46021 Add test case - switch_to_dns_forward_mode 2017-11-16 16:18:16 +08:00
Bin Xu
7f3f7bec5d
Merge pull request #4313 from immarvin/onissue
fix issue #4299 `xdsh` return with no output when "site.master" is not set
2017-11-16 16:03:45 +08:00
Samveen
0d924af0fe dodiscovery: better disksize - ordered by major,minor and no \n (#4219)
* better disksize: ordered by major,minor and no `\n`

* nodediscover:`disksize` sent correctly: no need to `split`,`join`

* general sort with explicit key columns, fix search pattern

* dodiscovery: Fix bugs

* dodiscovery: Fix ShellCheck SC2007,SC2004

* dodiscovery: simpler kcmdline parsing, disksize as IEC binary prefix
2017-11-16 01:49:54 -06:00
Yuan Bai
fbc5f08409
Merge pull request #4295 from robin2008/working
Integrate the simulators to performance baseline testing
2017-11-16 14:51:57 +08:00