From 2b5e08a92f41a4747df58b3853a2552798d7b2a9 Mon Sep 17 00:00:00 2001 From: penguhyang Date: Wed, 23 Mar 2016 02:30:50 -0400 Subject: [PATCH] Update the description for netboot attribute --- .../guides/admin-guides/basic_concepts/xcat_object/node.rst | 2 +- docs/source/guides/admin-guides/references/man5/noderes.5.rst | 4 ++-- docs/source/guides/admin-guides/references/man7/group.7.rst | 4 ++-- docs/source/guides/admin-guides/references/man7/node.7.rst | 4 ++-- perl-xCAT/xCAT/Schema.pm | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst index 6a2336ea0..b8928ff7e 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst @@ -35,7 +35,7 @@ Key Attrubutes +==========================+======================+===================================+ | x86, x86_64 | ALL | pxe, xnba | +--------------------------+----------------------+-----------------------------------+ - | ppc64 | <=rhel6, <=sles11 | yaboot | + | ppc64 | <=rhel6, <=sles11.3 | yaboot | +--------------------------+----------------------+-----------------------------------+ | ppc64 | >=rhels7, >=sles11.4 | grub2,grub2-http,grub2-tftp | +--------------------------+----------------------+-----------------------------------+ diff --git a/docs/source/guides/admin-guides/references/man5/noderes.5.rst b/docs/source/guides/admin-guides/references/man5/noderes.5.rst index abce512c4..05bd332a1 100644 --- a/docs/source/guides/admin-guides/references/man5/noderes.5.rst +++ b/docs/source/guides/admin-guides/references/man5/noderes.5.rst @@ -53,8 +53,8 @@ noderes Attributes: The type of network booting to use for this node. Valid values: Arch OS valid netboot options x86, x86_64 ALL pxe, xnba - ppc64 <=rhel6, <=sles11 yaboot - ppc64 >=rhels7 grub2,grub2-http,grub2-tftp + ppc64 <=rhel6, <=sles11.3 yaboot + ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp diff --git a/docs/source/guides/admin-guides/references/man7/group.7.rst b/docs/source/guides/admin-guides/references/man7/group.7.rst index b9367326f..8f03c6ac7 100644 --- a/docs/source/guides/admin-guides/references/man7/group.7.rst +++ b/docs/source/guides/admin-guides/references/man7/group.7.rst @@ -572,9 +572,9 @@ group Attributes: x86, x86_64 ALL pxe, xnba - ppc64 <=rhel6, <=sles11 yaboot + ppc64 <=rhel6, <=sles11.3 yaboot - ppc64 >=rhels7 grub2,grub2-http,grub2-tftp + ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot diff --git a/docs/source/guides/admin-guides/references/man7/node.7.rst b/docs/source/guides/admin-guides/references/man7/node.7.rst index cde2af1ea..441a15055 100644 --- a/docs/source/guides/admin-guides/references/man7/node.7.rst +++ b/docs/source/guides/admin-guides/references/man7/node.7.rst @@ -572,9 +572,9 @@ node Attributes: x86, x86_64 ALL pxe, xnba - ppc64 <=rhel6, <=sles11 yaboot + ppc64 <=rhel6, <=sles11.3 yaboot - ppc64 >=rhels7 grub2,grub2-http,grub2-tftp + ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 166909e8d..16cda35eb 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -646,8 +646,8 @@ noderes => { netboot => 'The type of network booting to use for this node. Valid values: Arch OS valid netboot options x86, x86_64 ALL pxe, xnba - ppc64 <=rhel6, <=sles11 yaboot - ppc64 >=rhels7 grub2,grub2-http,grub2-tftp + ppc64 <=rhel6, <=sles11.3 yaboot + ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp