xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-20 09:08:15 +00:00
Code Issues Releases Wiki Activity
21,212 Commits 22 Branches 79 Tags
804ce47c0c939c9cfc99b0e9822555a8febfd00b
Commit Graph

21212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jarrod Johnson
804ce47c0c Allow disabling nodesetwarning... again 2017-12-09 08:58:22 -05:00
Miro
ae82fb8290 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-28 14:02:02 -05:00
Jarrod Johnson
6c2459731b Merge tag '2.13.8' into lenovobuild2.13 
xCAT 2.13.8  release
 2017-11-28 14:01:03 -05:00
Jarrod Johnson
73f21a5417 Also, packamige applies 2017-11-16 15:45:45 -05:00
Jarrod Johnson
a42fc626ca Merge branch 'lenovobuild2.13' of github.com:jjohnson42/xcat-core into lenovobuild2.13 2017-11-16 15:03:47 -05:00
Jarrod Johnson
ccda90fc6d Add disablenodesetwarning to man page 2017-11-16 15:03:45 -05:00
Jarrod Johnson
229533cbda Further improve the filtering of OneCli 2017-11-15 09:47:39 -05:00
Jarrod Johnson
a6932bb440 Add onecli 2.1.0 output masking 2017-11-15 09:18:20 -05:00
Jarrod Johnson
db4dc42b9d Add note about the nature of the auto-reconnect 
There was some confusion about the retry interval, provide in
the manpage in case others want to know how it works and how
to speed it up.
 2017-11-10 10:34:23 -05:00
Jarrod Johnson
0f45f2e517 Fix makeconfluentcfg without arguments 
There were mistakes in the switch table processing attempt
for non noderange makeconfluentcfg.
 2017-11-09 09:27:53 -05:00
Jarrod Johnson
9de9193d0c Skip connection to BMC on rpower reseat 
rpower reseat gets directed at the chassis manager.  Skip the
superfluous connection to the BMC and keep it from interfering
with the reseat.
 2017-11-07 15:17:00 -05:00
Jarrod Johnson
f01ab1a961 Copy in hidden files to mknb 
mknb was ignoring hidden files (e.g. .screenrc), fix this.
 2017-11-07 11:51:26 -05:00
zet809
fe7405f170 Merge pull request #4227 from xcat2/master 
Merge master to 2.13 branch for 2.13.8 release(2)
2.13.8 		2017-11-02 15:05:35 +08:00
Weihua Hu
654ba50e91 Merge pull request #4226 from zet809/modify_release_info_for_2.13.8 
modify release info for 2.13.8
 2017-11-02 15:03:36 +08:00
zet809
c3c394d9eb Merge pull request #4174 from robin2008/stateless-sn-doc 
Stateless service node RTD update
 2017-11-02 15:00:53 +08:00
Bin Xu
cc5eaa15ba Fix the wrong path for xCATsn in both diskless_sn and diskfull_sn 2017-11-02 14:54:21 +08:00
ertaozh
d3160bda34 modify release info for 2.13.8 2017-11-02 02:38:22 -04:00
cxhong
01bf03de74 switch_macmap output showed mac address on the wrong port for cumulus (#4225) 
switch
 2017-11-01 21:46:04 -05:00
Victor Hu
4d06dc05e8 Merge pull request #4222 from cxhong/4221 
bmcdiscover blathering garbage on non OpenBMC nodes
 2017-11-01 13:14:32 -04:00
Casandra Qiu
469babefab bmcdiscover blathering garbage on non OpenBMC nodes 2017-11-01 13:03:20 -04:00
Bin Xu
6a2d713e29 adjust the old document structure for stateless sn 2017-11-01 22:35:36 +08:00
zet809
4036f216bf Merge pull request #4212 from mattaezell/quiet_discover 
Quiet some debug messages during discovery
 2017-11-01 13:33:22 +08:00
Matt Ezell
bae354316e Quiet some debug messages during discovery 2017-10-31 21:13:20 -04:00
zet809
0a25883b29 Merge pull request #4210 from xcat2/master 
Merge master to 2.13 branch for 2.13.8 release(1)
 2017-10-31 17:41:11 +08:00
zet809
f744bae33f Merge pull request #4207 from xuweibj/I4192 
Fix issue 4192, fork to login before send real login request
 2017-10-31 17:39:16 +08:00
XuWei
6a050f5974 Fix issue 4192, fork to login before send real login request 2017-10-31 05:31:56 -04:00
Weihua Hu
8d6ecf304d Merge pull request #4209 from bybai/fixvlan 
fix wrong type for vlan in confignetwork and enhance testcases typo error
 2017-10-31 16:14:36 +08:00
bybai
aa78a856f9 fix typo in confignetwork test cases 2017-10-31 03:15:18 -04:00
bybai
38bcab9dec fix vlan type 2017-10-31 03:14:32 -04:00
Bin Xu
149483dac5 Merge pull request #3905 from whowutwut/coral_reference_doc 
CORAL Reference Documentation, initial skeleton
 2017-10-31 10:18:23 +08:00
Victor Hu
8f66479f1b Added section for known issues, reduce the level being displayed 2017-10-30 16:29:05 -04:00
Victor Hu
c205aa5a71 Merge pull request #4184 from zet809/update_nvme_firmware 
add the script to update nvme firmware
 2017-10-30 10:41:36 -04:00
ertaozh
cc79123674 update script update_nvme_firmware based on Victor's comments 2017-10-30 09:15:42 -04:00
zet809
a69504b1bf Merge pull request #4168 from whowutwut/debug_rflash_openbmc 
[OpenBMC] rflash -l, Reset the update_priority on each loop, or it will pick up the priority from the previous
 2017-10-30 19:47:46 +08:00
Bin Xu
0133577acf Fix #4194, enhancement on xcatperftest (#4195) 
1, add a new mode to run on existing environment
  2, adjust the output line format
  3, make the way to run mkdef be compatible with old release
  4, add PERF_CSV_CHAR variable to control the delimiter used in CSV report
 2017-10-30 02:08:34 -05:00
zet809
46358c576a Merge pull request #4159 from samveen/fix_discovery 
dodiscovery: get lan channel, dont use `1` (eg. `HP` uses `2`)
 2017-10-30 13:57:43 +08:00
Victor Hu
a115e3b7a3 Change update_priority to local variable since it's only used inside the loop 2017-10-27 14:29:16 -04:00
Chuck Brazie
619593db4a Merge pull request #4188 from StevenGessner/verifyNode_1026 
z/VM IVP should tolerate slow xcatd startup.
 2017-10-27 10:10:42 -04:00
zet809
ce1c0859e1 Merge pull request #4147 from chuckbrazie/master_ChuckB_updatesSinceApril 
Chuck Brazie updates since April, plus add back in xcatws.cgi from 2.13
 2017-10-27 17:59:08 +08:00
zet809
151144f6bf Merge pull request #4151 from chenglch/rflash 
Fix the spelling error for the openbmc rflash message
 2017-10-27 17:53:39 +08:00
zet809
70a1c5b71e Merge pull request #4170 from whowutwut/bmc_reboot 
[OpenBMC] Hide the 504 timeout when doing a reboot of BMC since the REST service may be down
 2017-10-27 17:42:00 +08:00
chenglch
8ac900082e Merge pull request #3780 from samveen/apidocfix 
Comment KeyFile instead of replacing as key is included in CertFile
 2017-10-27 04:31:10 -05:00
Bin Xu
9abe96809b Fix 3026, ignore the rsetboot for openbmc box in petitboot during the stateful installation (#4193) 2017-10-27 04:10:47 -05:00
chenglch
21ea7f1160 Merge pull request #4131 from zet809/add_mlx5_for_genesis_base 
add mlx5_ib,mlx5_core to genesis_base
 2017-10-27 02:45:03 -05:00
zet809
7e7ba8b252 Merge pull request #4153 from xuweibj/reset_boot 
rpower reset and boot for OpenBMC support
 2017-10-27 15:41:05 +08:00
chenglch
1aca1aa60b Merge pull request #4191 from whowutwut/4053_multiple_args 
Improve the parsing for rflash and detect error arguments in parsing
 2017-10-26 21:35:09 -05:00
chenglch
607d3e229f Merge pull request #4185 from bybai/chdef 
enhance chdef pre-check attribute
 2017-10-26 21:34:51 -05:00
cxhong
6263ef39cd Add Node name to the /opt/xcat/xcatinfo for diskfull installation (#4190) 2017-10-26 21:28:52 -05:00
Victor Hu
d947e6b899 Improve the parsing for rflash and detect issues early on 2017-10-26 16:39:46 -04:00
cxhong
e4d18dd895 Merge pull request #4187 from whowutwut/improve_openbmc_debug_logging 
[OpenBMC] Add timestamp to debug logging messages framework
 2017-10-26 15:41:37 -04:00