xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

Modify message for rspconfig ipsrc option

Browse Source
This commit is contained in:
ertaozh
2017-10-19 02:48:04 -04:00
parent c92834bfe1
commit 12ef155577
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
View File

@@ -408,13 +408,13 @@ OPTIONS
\ **ipsrc**\
Get the ip source for OpenBMC.
Get the IP source for OpenBMC.
\ **ip**\
The ip address.
The IP address.

4
xCAT-client/pods/man1/rspconfig.1.pod
View File

@@ -310,11 +310,11 @@ Get or set vlan ID. For get vlan ID, if vlan is not enabled, 'BMC VLAN disabled'
=item B<ipsrc>
Get the ip source for OpenBMC.
Get the IP source for OpenBMC.
=item B<ip>
The ip address.
The IP address.
=item B<memdecfg>={B<configure | deconfigure>:I<processingunit>:I<unit|bank>:I<id,...>}

5
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -630,7 +630,7 @@ sub parse_args {
return ([ 1, "Can not configure and display nodes' value at the same time" ]) if ($setorget and $setorget eq "get");
my $key = $1;
my $value = $2;
return ([ 1, "Unsupport to configure ipsrc" ]) if ($key eq "ipsrc");
return ([ 1, "Changing ipsrc value is currently not supported." ]) if ($key eq "ipsrc");
return ([ 1, "Unsupported command: $command $key" ]) unless ($key =~ /^ip$|^netmask$|^gateway$|^hostname$|^vlan$/);
my $nodes_num = @$noderange;
@@ -1845,9 +1845,6 @@ sub rspconfig_response {
if ($adapter_id) {
if (defined($content{Address}) and $content{Address}) {
unless ($address =~ /n\/a/) {
if ($ipsrc eq "DHCP" and $xcatdebugmode) {
process_debug_info($node, "There is an IP address:$address got through DHCP");
}
# We have already processed an entry with adapter information.
# This must be a second entry. Display an error. Currently only supporting
# an adapter with a single IP address set.