From 206f3a987346fa6a1c7faeac5ca78276995a4e58 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 13 Jan 2016 08:28:12 -0500 Subject: [PATCH 1/2] Remove the xcat2_support_list file and instead point to the release notes since that is updated with the current supported operating system There's no need to have another location for this information --- .../guides/install-guides/apt/index.rst | 4 ++- .../install-guides/apt/prepare_mgmt_node.rst | 2 -- .../guides/install-guides/common_sections.rst | 7 ++++ .../guides/install-guides/yum/index.rst | 4 ++- .../install-guides/yum/prepare_mgmt_node.rst | 2 -- .../guides/install-guides/zypper/index.rst | 4 ++- .../zypper/prepare_mgmt_node.rst | 2 -- docs/source/xcat2_support_list.rst | 33 ------------------- 8 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 docs/source/xcat2_support_list.rst diff --git a/docs/source/guides/install-guides/apt/index.rst b/docs/source/guides/install-guides/apt/index.rst index 1f2014b7b..2b8cc45d3 100644 --- a/docs/source/guides/install-guides/apt/index.rst +++ b/docs/source/guides/install-guides/apt/index.rst @@ -1,7 +1,9 @@ Installation Guide for Ubuntu Server LTS ======================================== -For the list of currently supported Ubuntu LTS operatin systems, see :ref:`ubuntu-os-support-label`. +.. include:: ../common_sections.rst + :start-after: BEGIN_see_release_notes + :end-before: END_see_release_notes .. toctree:: :maxdepth: 2 diff --git a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst index 9660fb94e..f0ca608fb 100644 --- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst @@ -6,8 +6,6 @@ These steps prepare the Management Node or xCAT Installation Install an OS on the Management Node ------------------------------------ -Install one of the supported operating systems :ref:`ubuntu-os-support-label` on to your target management node - .. include:: ../common_sections.rst :start-after: BEGIN_install_os_mgmt_node :end-before: END_install_os_mgmt_node diff --git a/docs/source/guides/install-guides/common_sections.rst b/docs/source/guides/install-guides/common_sections.rst index f16291c7a..213b14ac8 100644 --- a/docs/source/guides/install-guides/common_sections.rst +++ b/docs/source/guides/install-guides/common_sections.rst @@ -1,6 +1,13 @@ +.. BEGIN_see_release_notes + +For the current list of operating systems supported and verified by the development team for the different releases of xCAT, see the :doc:`xCAT2 Release Notes `. + +.. END_see_release_notes + .. BEGIN_install_os_mgmt_node +Install one of the supported operating systems on to your target management node. The system requirements for your xCAT management node largely depend on the size of the cluster you plan to manage and the type of provisioning used (diskful, diskless, system clones, etc). The majority of system load comes during cluster provisioning time. diff --git a/docs/source/guides/install-guides/yum/index.rst b/docs/source/guides/install-guides/yum/index.rst index 7bc46861b..37ae5033f 100644 --- a/docs/source/guides/install-guides/yum/index.rst +++ b/docs/source/guides/install-guides/yum/index.rst @@ -1,7 +1,9 @@ Installation Guide for Red Hat Enterprise Linux =============================================== -For the list of currently supported RHEL operating systems, see :ref:`rhels-os-support-label`. +.. include:: ../common_sections.rst + :start-after: BEGIN_see_release_notes + :end-before: END_see_release_notes .. toctree:: :maxdepth: 2 diff --git a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst index f75be8e38..d02ec031e 100644 --- a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst @@ -6,8 +6,6 @@ These steps prepare the Management Node for xCAT Installation Install an OS on the Management Node ------------------------------------ -Install one of the supported operating systems :ref:`rhels-os-support-label` on to your target Management Node - .. include:: ../common_sections.rst :start-after: BEGIN_install_os_mgmt_node :end-before: END_install_os_mgmt_node diff --git a/docs/source/guides/install-guides/zypper/index.rst b/docs/source/guides/install-guides/zypper/index.rst index 8f3a65c59..2a44ca0e3 100644 --- a/docs/source/guides/install-guides/zypper/index.rst +++ b/docs/source/guides/install-guides/zypper/index.rst @@ -1,7 +1,9 @@ Installation Guide for SUSE Linux Enterprise Server =================================================== -For the list of currently supported SLES operating systems, see :ref:`sles-os-support-label`. +.. include:: ../common_sections.rst + :start-after: BEGIN_see_release_notes + :end-before: END_see_release_notes .. toctree:: :maxdepth: 2 diff --git a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst index f44d5b77d..a795339b4 100644 --- a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst @@ -6,8 +6,6 @@ These steps prepare the Management Node for xCAT Installation Install an OS on the Management Node ------------------------------------ -Install one of the supported operating systems :ref:`sles-os-support-label` on to your target Management Node - .. include:: ../common_sections.rst :start-after: BEGIN_install_os_mgmt_node :end-before: END_install_os_mgmt_node diff --git a/docs/source/xcat2_support_list.rst b/docs/source/xcat2_support_list.rst deleted file mode 100644 index 3ff00cd58..000000000 --- a/docs/source/xcat2_support_list.rst +++ /dev/null @@ -1,33 +0,0 @@ -Supported Architectures -======================= - -ppc64 -ppc64le -x86_64 - -Supported Operating Systems -=========================== - -.. _rhels-os-support-label: - -Red Hat Enterprise Linux (RHEL) operating systems -------------------------------------------------- - -* rhels 6.X -* rhels 7.1 (little endian) - -.. _sles-os-support-label: - -Suse Linux Enterprise Server (SLES) operating systems ------------------------------------------------------ - -* sles 11.3 -* sles 12.X - -.. _ubuntu-os-support-label: - -Ubuntu Server LTS ------------------ - -* ubuntu 14.04.1 (ppc64le) -* ubuntu 14.04.2 (ppc64le) From 851ca19fa0876c259ffebfccc2f82653e3435b07 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 13 Jan 2016 13:34:36 -0500 Subject: [PATCH 2/2] Change a word from review of the changes --- docs/source/guides/install-guides/common_sections.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/common_sections.rst b/docs/source/guides/install-guides/common_sections.rst index 213b14ac8..be5e43d22 100644 --- a/docs/source/guides/install-guides/common_sections.rst +++ b/docs/source/guides/install-guides/common_sections.rst @@ -7,7 +7,7 @@ For the current list of operating systems supported and verified by the developm .. BEGIN_install_os_mgmt_node -Install one of the supported operating systems on to your target management node. +Install one of the supported operating systems on your target management node. The system requirements for your xCAT management node largely depend on the size of the cluster you plan to manage and the type of provisioning used (diskful, diskless, system clones, etc). The majority of system load comes during cluster provisioning time.