xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-21 16:22:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4734 from xcat2/master

Browse Source 
Merge master to 2.13 for 2.13.10 release(4)
This commit is contained in:
zet809
2018-01-26 13:03:04 +08:00
committed by GitHub
parent 7fcd37ffb7 3f10f74c94
commit 4fe63ecd9f
10 changed files with 76 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.rst
+11 -67
View File
@@ -6,9 +6,18 @@ xCAT is a toolkit for the deployment and administration of clusters.
Documentation
-------------
xCAT documentation is available at: http://xcat-docs.readthedocs.io/en/latest/
Latest xCAT documentation is available at: http://xcat-docs.readthedocs.io/en/latest/
`document for xCAT 2.13.10 <http://xcat-docs.readthedocs.io/en/2.13.10/>`_
`document for xCAT 2.13.9 <http://xcat-docs.readthedocs.io/en/2.13.9/>`_
`document for xCAT 2.13 <http://xcat-docs.readthedocs.io/en/2.13.0/>`_
`document for xCAT 2.12 <http://xcat-docs.readthedocs.io/en/2.12/>`_
`document for xCAT 2.11 <http://xcat-docs.readthedocs.io/en/2.11/>`_
|docs_latest| |docs_2139| |docs_2138| |docs_2137| |docs_2136| |docs_2135| |docs_2134| |docs_2133| |docs_2132| |docs_2131| |docs_2130| |docs_212|
Open Source License
-------------------
@@ -21,68 +30,3 @@ Developers
Developers and prospective contributors are encouraged to read the `Developers Guide <http://xcat-docs.readthedocs.io/en/latest/developers/>`_
In particular the `GitHub <http://xcat-docs.readthedocs.io/en/latest/developers/github/>`_ related subsection.
.. |docs_2139| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.9
:alt: 2.13.9 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.9/
.. |docs_2138| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.8
:alt: 2.13.8 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.8/
.. |docs_2137| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.7
:alt: 2.13.7 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.7/
.. |docs_2136| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.6
:alt: 2.13.6 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.6/
.. |docs_2135| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.5
:alt: 2.13.5 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.5/
.. |docs_2134| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.4
:alt: 2.13.4 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.4/
.. |docs_2133| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.3
:alt: 2.13.3 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.3/
.. |docs_2132| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.2
:alt: 2.13.2 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.2/
.. |docs_2131| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.1
:alt: 2.13.1 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.1/
.. |docs_2130| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.0
:alt: 2.13.0 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.13.0/
.. |docs_212| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.12
:alt: 2.12 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.12/
.. |docs_211| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.11
:alt: 2.11 documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/2.11/
.. |docs_latest| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=latest
:alt: Latest documentation status
:scale: 100%
:target: http://xcat-docs.readthedocs.io/en/latest/
docs/source/conf.py
+1 -1
View File
@@ -59,7 +59,7 @@ author = u'IBM Corporation'
# The short X.Y version.
version = '2'
# The full version, including alpha/beta/rc tags.
release = '2.13.9'
release = '2.13.10'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+10
View File
@@ -63,6 +63,10 @@ OpenBMC specific:
\ **rspconfig**\ \ *noderange*\ \ **autoreboot={0|1}**\
\ **rspconfig**\ \ *noderange*\ \ **bootmode**\
\ **rspconfig**\ \ *noderange*\ \ **bootmode={safe|regular|setup}**\
MPA specific:
=============
@@ -462,6 +466,12 @@ OPTIONS
\ **bootmode**\
Display or control BMC Boot Mode attribute setting.
\ **dump**\
Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
docs/source/guides/admin-guides/references/man5/servicenode.5.rst
+1 -1
View File
@@ -68,7 +68,7 @@ servicenode Attributes:
\ **conserver**\
Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
docs/source/guides/admin-guides/references/man5/site.5.rst
+4
View File
@@ -136,6 +136,8 @@ site Attributes:
service nodes will ignore this value and always be configured to forward
to the management node.
emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section.
master: The hostname of the xCAT management node, as known by the nodes.
nameservers: A comma delimited list of DNS servers that each node in the cluster should
@@ -260,6 +262,8 @@ site Attributes:
defserialspeed: The default serial speed - currently only used by mknb.
disablenodesetwarning: Allow the legacy xCAT non-osimage style nodeset to execute.
genmacprefix: When generating mac addresses automatically, use this manufacturing
prefix (e.g. 00:11:aa)
docs/source/guides/admin-guides/references/man7/group.7.rst
+2 -3
View File
@@ -679,8 +679,7 @@ group Attributes:
\ **nicsadapter**\ (nics.nicsadapter)
Comma-separated list of extra parameters that will be used for each NIC configuration.
<nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
Comma-separated list of NIC information collected by getadapter. <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
@@ -975,7 +974,7 @@ group Attributes:
\ **setupconserver**\ (servicenode.conserver)
Do we set up Conserver on this service node? Valid values:1 or 0. If 1, configures and starts conserver daemon. If 0, it does not change the current state of the service.
Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
docs/source/guides/admin-guides/references/man7/node.7.rst
+2 -3
View File
@@ -679,8 +679,7 @@ node Attributes:
\ **nicsadapter**\ (nics.nicsadapter)
Comma-separated list of extra parameters that will be used for each NIC configuration.
<nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
Comma-separated list of NIC information collected by getadapter. <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
@@ -987,7 +986,7 @@ node Attributes:
\ **setupconserver**\ (servicenode.conserver)
Do we set up Conserver on this service node? Valid values:1 or 0. If 1, configures and starts conserver daemon. If 0, it does not change the current state of the service.
Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
docs/source/overview/xcat2_release.rst
+12
View File
@@ -14,6 +14,18 @@ xCAT 2.13.x
|xCAT |New OS |New |New Feature |
|Version | |Hardware | |
+=================================+===============+=============+==================================+
|| xCAT 2.13.10 | | |- OpenBMC support: |
|| 2018/1/26 | | | |
|| | | | rspconfig powersupplyredundancy,|
| `2.13.10 Release Notes <https://| | | powerrestorepolicy,bootmode |
| github.com/xcat2/xcat-core/wiki | | | reventlog implementation |
| /XCAT_2.13.10_Release_Notes>`_ | | | |
| | | |- goconserver enhancement |
| | | | |
| | | | run goconserver on SN |
| | | | |
| | | | redirect console log |
+---------------------------------+---------------+-------------+----------------------------------+
|| xCAT 2.13.9 | | |- OpenBMC support: |
|| 2017/12/18 | | | |
|| | | | rflash -a/-u enhance, add -d |
xCAT-client/pods/man1/rspconfig.1.pod
+8
View File
@@ -40,6 +40,10 @@ B<rspconfig> I<noderange> B<autoreboot>
B<rspconfig> I<noderange> B<autoreboot={0|1}>
B<rspconfig> I<noderange> B<bootmode>
B<rspconfig> I<noderange> B<bootmode={safe|regular|setup}>
=head2 MPA specific:
B<rspconfig> I<noderange> {B<sshcfg>|B<snmpcfg>|B<pd1>|B<pd2>|B<network>|B<swnet>|B<ntp>|B<textid>|B<frame>}
@@ -350,6 +354,10 @@ Display or control BMC Power Supply Redundancy attribute setting.
Display or control BMC Auto Reboot attribute setting.
=item B<bootmode>
Display or control BMC Boot Mode attribute setting.
=item B<dump>
Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
xCAT-server/lib/xcat/plugins/openbmc.pm
+25 -12
View File
@@ -596,13 +596,27 @@ my %api_config_info = (
type => "boolean",
subcommand => "autoreboot",
},
RSPCONFIG_BOOT_MODE => {
command => "rspconfig",
url => "/control/host0/boot",
attr_url => "BootMode",
display_name => "BMC BootMode",
instruct_msg => "",
type => "attribute",
subcommand => "bootmode",
attr_value => {
regular => "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular",
safe => "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe",
setup => "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup",
},
},
RSPCONFIG_POWERSUPPLY_REDUNDANCY => {
command => "rspconfig",
url => "/sensors/chassis/PowerSupplyRedundancy",
attr_url => "/action/setValue",
query_url => "/action/getValue",
display_name => "BMC PowerSupplyRedundancy",
instruct_msg => "bmc reboot is required",
instruct_msg => "",
type => "action_attribute",
subcommand => "powersupplyredundancy",
attr_value => {
@@ -1171,7 +1185,7 @@ sub parse_args {
my $all_subcommand = "";
foreach $subcommand (@ARGV) {
$::RSPCONFIG_CONFIGURED_API_KEY = &is_valid_config_api($subcommand, $callback);
if ($::RSPCONFIG_CONFIGURED_API_KEY != -1) {
if ($::RSPCONFIG_CONFIGURED_API_KEY ne -1) {
# subcommand defined in the configured API hash, return from here, the RSPCONFIG_CONFIGURED_API_KEY is the key into the hash
return;
}
@@ -1574,7 +1588,7 @@ sub parse_command_status {
my @options = ();
my $num_subcommand = @$subcommands;
#Setup chain to process the configured command
if ($::RSPCONFIG_CONFIGURED_API_KEY != -1) {
if ($::RSPCONFIG_CONFIGURED_API_KEY ne -1) {
$subcommand = $$subcommands[0];
# Check if setting or quering
if ($subcommand =~ /^(\w+)=(.*)/) {
@@ -1611,7 +1625,7 @@ sub parse_command_status {
else {
# Everything else is invalid
xCAT::SvrUtils::sendmsg([1, "Invalid value '$subcommand_value' for '$subcommand_key'"], $callback);
my @valid_values = keys $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{attr_value};
my @valid_values = keys %{ $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{attr_value} };
xCAT::SvrUtils::sendmsg([1, "Valid values: " . join(",", @valid_values)], $callback);
return 1;
}
@@ -3609,16 +3623,15 @@ sub rspconfig_api_config_response {
# For example "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore"
# will be displayed as "Restore"
my @attr_value = split('\.', $value);
my $last_component = @attr_value[-1];
my @valid_values = values $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{attr_value};
my $last_component = $attr_value[-1];
my @valid_values = values %{ $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{attr_value} };
if ($value) {
if ($value ~~ @valid_values) {
# Received one of the expected values (defined in attr_value hash for this command
xCAT::SvrUtils::sendmsg($api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} . " : $last_component", $callback, $node);
} else {
xCAT::SvrUtils::sendmsg($api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} . " : $last_component", $callback, $node);
my $found = grep(/$value/, @valid_values);
if ($found eq 0) {
# Received data value not expected
xCAT::SvrUtils::sendmsg($api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} . " : $last_component", $callback, $node);
xCAT::SvrUtils::sendmsg("Warning: Unexpected value set. Valid values: " . join(",", @valid_values), $callback, $node);
xCAT::SvrUtils::sendmsg("WARNING: Unexpected value set: $value", $callback, $node);
xCAT::SvrUtils::sendmsg("WARNING: Valid values: " . join(",", @valid_values), $callback, $node);
}
}
else {