diff --git a/docs/source/guides/install-guides/apt/install_xcat.rst b/docs/source/guides/install-guides/apt/install_xcat.rst index 08264e3c9..34368c778 100644 --- a/docs/source/guides/install-guides/apt/install_xcat.rst +++ b/docs/source/guides/install-guides/apt/install_xcat.rst @@ -29,12 +29,3 @@ Install xCAT with the following command: :: apt-get install xCAT -**Note:** During the install, you must accept the *xCAT Security Key* to continue: :: - - Retrieving key from file:///root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Importing GPG key 0xC6565BC9: - Userid: "xCAT Security Key " - From : /root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Is this ok [y/N]: - - 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 b8cd92d4f..9660fb94e 100644 --- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst @@ -38,7 +38,7 @@ xCAT uses the apt package manager on Ubuntu Linux distributions to install and r Set up Network -------------- -The Management Node IP address should be set to a **static** ip address. +The Management Node IP address should be set to a **static** IP address. Modify the ``interfaces`` file in ``/etc/network`` and configure a static IP address. :: diff --git a/docs/source/guides/install-guides/common_sections.rst b/docs/source/guides/install-guides/common_sections.rst index 0a2c4a6ee..73579a05e 100644 --- a/docs/source/guides/install-guides/common_sections.rst +++ b/docs/source/guides/install-guides/common_sections.rst @@ -21,7 +21,7 @@ The system requirements for your xCAT management node largely depends on the siz .. BEGIN_setup_mgmt_node_network -The Management Node IP address should be set to a **static** ip address. +The Management Node IP address should be set to a **static** IP address. Modify the ``ifcfg-`` file in ``/etc/sysconfig/network-scripts`` and configure a static IP address. @@ -150,24 +150,6 @@ Unless you are downloading ``xcat-dep`` to match a specific package tested with .. END_configure_xcat_local_repo_xcat-dep_DEBIAN -.. BEGIN_installing_xcat - -Install xCAT with the following command: :: - - yum clean all (optional) - yum install xCAT - - -**Note:** During the install, you must accept the *xCAT Security Key* to continue: :: - - Retrieving key from file:///root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Importing GPG key 0xC6565BC9: - Userid: "xCAT Security Key " - From : /root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Is this ok [y/N]: - -.. END_installing_xcat - .. BEGIN_verifying_xcat @@ -224,11 +206,3 @@ xCAT is started automatically after the installation, but the following commands .. END_verifying_xcat -.. BEGIN_update_xcat - -If at a later date you want to update xCAT, first, update the software repositories and then run: :: - - yum clean metadata # or, yum clean all - yum update '*xCAT*' - -.. END_update_xcat diff --git a/docs/source/guides/install-guides/yum/install_xcat.rst b/docs/source/guides/install-guides/yum/install_xcat.rst index ab6ab5741..484e49845 100644 --- a/docs/source/guides/install-guides/yum/install_xcat.rst +++ b/docs/source/guides/install-guides/yum/install_xcat.rst @@ -1,7 +1,17 @@ Install xCAT ------------ -.. include:: ../common_sections.rst - :start-after: BEGIN_installing_xcat - :end-before: END_installing_xcat +Install xCAT with the following command: :: + + yum clean all (optional) + yum install xCAT + + +**Note:** During the install, you must accept the *xCAT Security Key* to continue: :: + + Retrieving key from file:///root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key + Importing GPG key 0xC6565BC9: + Userid: "xCAT Security Key " + From : /root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key + Is this ok [y/N]: diff --git a/docs/source/guides/install-guides/yum/update_xcat.rst b/docs/source/guides/install-guides/yum/update_xcat.rst index 60c184b6a..fc01d99ad 100644 --- a/docs/source/guides/install-guides/yum/update_xcat.rst +++ b/docs/source/guides/install-guides/yum/update_xcat.rst @@ -1,6 +1,10 @@ Updating xCAT ============= -.. include:: ../common_sections.rst - :start-after: BEGIN_update_xcat - :end-before: END_update_xcat +If at a later date you want to update xCAT, first, update the software repositories and then run: :: + + yum clean metadata # or, yum clean all + yum update '*xCAT*' + + + diff --git a/docs/source/guides/install-guides/zypper/install_xcat.rst b/docs/source/guides/install-guides/zypper/install_xcat.rst index 9a87d4bbc..ccf964abc 100644 --- a/docs/source/guides/install-guides/zypper/install_xcat.rst +++ b/docs/source/guides/install-guides/zypper/install_xcat.rst @@ -7,13 +7,5 @@ Install xCAT with the following command: :: zypper install xCAT -**Note:** During the install, you must accept the *xCAT Security Key* to continue: :: - - Retrieving key from file:///root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Importing GPG key 0xC6565BC9: - Userid: "xCAT Security Key " - From : /root/xcat/xcat-dep/rh6/ppc64/repodata/repomd.xml.key - Is this ok [y/N]: - - +**Note:** During the install, you must accept the *xCAT Security Key* to continue 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 f4df86b02..e285080df 100644 --- a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst @@ -38,5 +38,7 @@ xCAT uses the zypper package manager on SLES Linux distributions to install and Set up Network -------------- +The Management Node IP address should be set to a **static** IP address. + Modify the ``ifcfg-`` file in ``/etc/sysconfig/network/`` and configure a static IP address.