diff --git a/docs/source/guides/install-guides/apt/install_xcat.rst b/docs/source/guides/install-guides/apt/install_xcat.rst index ab6ab5741..34368c778 100644 --- a/docs/source/guides/install-guides/apt/install_xcat.rst +++ b/docs/source/guides/install-guides/apt/install_xcat.rst @@ -1,7 +1,31 @@ Install xCAT ------------ -.. include:: ../common_sections.rst - :start-after: BEGIN_installing_xcat - :end-before: END_installing_xcat +The xCAT GPG Public Key must be added for apt to verify the xCAT packages :: + + wget -O - "http://xcat.org/files/xcat/repos/apt/apt.key" | apt-key add - + +Add the necessary apt-repositories to the management node :: + + # Install the add-apt-repository command + apt-get install software-properties-common + + # For x86_64: + add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main" + add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main" + add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" + add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates universe" + + # For ppc64el: + add-apt-repository "deb http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc) main" + add-apt-repository "deb http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc)-updates main" + add-apt-repository "deb http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc) universe" + add-apt-repository "deb http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc)-updates universe" + +Install xCAT with the following command: :: + + apt-get clean all + apt-get update + apt-get install xCAT + 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 3b7ca7c9e..9660fb94e 100644 --- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst @@ -15,11 +15,36 @@ Install one of the supported operating systems :ref:`ubuntu-os-support-label` on Configure the Base OS Repository -------------------------------- -**TODO** +xCAT uses the apt package manager on Ubuntu Linux distributions to install and resolve dependency packages provided by the base operating system. Follow this section to create the repository for the base operating system on the Management Node + +#. Copy the DVD iso file to ``/tmp`` on the Management Node: :: + + # This example will use ubuntu-14.04.3-server-ppc64el.iso + +#. Mount the iso to ``/mnt/iso/ubuntu14`` on the Management Node. :: + + mkdir -p /mnt/iso/ubuntu14 + mount -o loop /tmp/ubuntu-14.04.3-server-ppc64el.iso /mnt/iso/ubuntu14 + +#. Create an apt repository file ``/etc/apt.repos.d/ubuntu14-dvd.repo`` that points to the locally mounted iso image from the above step. The file contents should appear as the following: :: + + [ubuntu-14-dvd-server] + name=UBUNTU 14 SERVER packages + baseurl=file:///mnt/iso/ubuntu14/Server + enabled=1 + gpgcheck=1 + Set up Network -------------- -.. include:: ../common_sections.rst - :start-after: BEGIN_setup_mgmt_node_network - :end-before: END_setup_mgmt_node_network +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. :: + + # The primary network interface + auto eth0 + iface eth0 inet static + address 10.3.31.11 + netmask 255.0.0.0 + diff --git a/docs/source/guides/install-guides/apt/update_xcat.rst b/docs/source/guides/install-guides/apt/update_xcat.rst index 60c184b6a..44412b88b 100644 --- a/docs/source/guides/install-guides/apt/update_xcat.rst +++ b/docs/source/guides/install-guides/apt/update_xcat.rst @@ -1,6 +1,8 @@ Updating xCAT ============= +If at a later date you want to update xCAT, first, update the software repositories and then run: :: + + apt-get update + apt-get upgrade xcat + -.. include:: ../common_sections.rst - :start-after: BEGIN_update_xcat - :end-before: END_update_xcat 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 ab6ab5741..ccf964abc 100644 --- a/docs/source/guides/install-guides/zypper/install_xcat.rst +++ b/docs/source/guides/install-guides/zypper/install_xcat.rst @@ -1,7 +1,11 @@ Install xCAT ------------ -.. include:: ../common_sections.rst - :start-after: BEGIN_installing_xcat - :end-before: END_installing_xcat +Install xCAT with the following command: :: + + zypper clean all (optional) + zypper install xCAT + + +**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 78f194405..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,6 +38,7 @@ xCAT uses the zypper package manager on SLES Linux distributions to install and Set up Network -------------- -.. include:: ../common_sections.rst - :start-after: BEGIN_setup_mgmt_node_network - :end-before: END_setup_mgmt_node_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. + diff --git a/docs/source/guides/install-guides/zypper/update_xcat.rst b/docs/source/guides/install-guides/zypper/update_xcat.rst index 60c184b6a..c18bb5b3c 100644 --- a/docs/source/guides/install-guides/zypper/update_xcat.rst +++ b/docs/source/guides/install-guides/zypper/update_xcat.rst @@ -1,6 +1,9 @@ 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: :: + + zypper refresh + zypper update "*xCAT*" + +