From 76d50d11ec0d57783d12a756044d3d25a89bced5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= Date: Wed, 15 Aug 2018 16:08:33 +0800 Subject: [PATCH] Update xCAT document for Ubuntu 18.04 (#5477) * Update xCAT document for Ubuntu 18.04 * Fix github issue #1203. Update document for Ubuntu installation without Internet. * Fix grammatical errors --- .../additionalpkg/ubuntu_os_other_pkg.rst | 12 ++++++++--- .../common/deployment/create_img.rst | 2 +- .../install-guides/apt/configure_xcat.rst | 8 ++++---- .../install-guides/apt/prepare_mgmt_node.rst | 17 ++++++++-------- docs/source/overview/xcat2_release.rst | 20 ++++++++++--------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst index f8caa0e95..0df30a33a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst @@ -34,6 +34,12 @@ Compute nodes can not access the internet If compute nodes cannot access the internet, there are two ways to install additional packages - * use apt proxy - * use local mirror - + * Use local mirror + Please refer the Ubuntu document below for how to set up your own local Ubuntu mirror. + https://help.ubuntu.com/community/Rsyncmirror + * Use apt-proxy + Please refer the Ubuntu document below for how to setup a apt-proxy server. + https://help.ubuntu.com/community/AptProxy + * Setting up apt-get to use a http-proxy. + Please refer the Ubuntu document below for how to do set up it. + https://help.ubuntu.com/community/AptGet/Howto#Setting_up_apt-get_to_use_a_http-proxy diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst index 6de3688dd..73a807f85 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst @@ -39,7 +39,7 @@ In these osimage definitions shown above **Note**: There are more things needed for **ubuntu ppc64le** osimages: -For ubuntu ppc64le, the initrd.gz shipped with the ISO does not support network booting. In order to install ubuntu with xCAT, you need to follow the steps below to complete the osimage definition. +For pre-18.04 version of Ubuntu for ppc64el, the initrd.gz shipped with the ISO does not support network booting. In order to install ubuntu with xCAT, you need to follow the steps below to complete the osimage definition. * Download mini.iso from diff --git a/docs/source/guides/install-guides/apt/configure_xcat.rst b/docs/source/guides/install-guides/apt/configure_xcat.rst index 887ef327f..8098b4068 100644 --- a/docs/source/guides/install-guides/apt/configure_xcat.rst +++ b/docs/source/guides/install-guides/apt/configure_xcat.rst @@ -13,9 +13,9 @@ From the xCAT download page, find the build you want to install and add to ``/et To configure the xCAT development build, add the following line to ``/etc/apt/sources.list``: :: [For x86_64 servers] - deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/core-snap trusty main + deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/core-snap bionic main [For ppc64el servers] - deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/devel/core-snap trusty main + deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/devel/core-snap bionic main **[xcat-dep]** @@ -23,9 +23,9 @@ To configure the xCAT development build, add the following line to ``/etc/apt/so To configure the xCAT deps online repository, add the following line to ``/etc/apt/sources.list``: :: [For x86_64 servers] - deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main + deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep bionic main [For ppc64el servers] - deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main + deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep bionic main If using internet repositories, continue to the next step to 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 20d3f0672..c6e4115be 100644 --- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst @@ -19,18 +19,19 @@ xCAT uses the apt package manager on Ubuntu Linux distributions to install and r #. Copy the DVD iso file to ``/tmp`` on the Management Node: :: - # This example will use ubuntu-14.04.3-server-ppc64el.iso + # This example will use ubuntu-18.04-server-ppc64el.iso + cp /path/to/ubuntu-18.04-server-ppc64el.iso /tmp -#. Mount the iso to ``/mnt/iso/ubuntu14`` on the Management Node. :: +#. Mount the iso to ``/mnt/iso/ubuntu`` on the Management Node. :: - mkdir -p /mnt/iso/ubuntu14 - mount -o loop /tmp/ubuntu-14.04.3-server-ppc64el.iso /mnt/iso/ubuntu14 + mkdir -p /mnt/iso/ubuntu + mount -o loop /tmp/ubuntu-18.04-server-ppc64el.iso /mnt/iso/ubuntu -#. 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: :: +#. Create an apt repository file ``/etc/apt.repos.d/ubuntu18-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 + [ubuntu-dvd-server] + name=Ubuntu 18.04 Server packages + baseurl=file:///mnt/iso/ubuntu/Server enabled=1 gpgcheck=1 diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst index 517a5433e..f16994b55 100644 --- a/docs/source/overview/xcat2_release.rst +++ b/docs/source/overview/xcat2_release.rst @@ -14,23 +14,23 @@ xCAT 2.14.x |xCAT |New OS |New |New Feature | |Version | |Hardware | | +=================================+===============+=============+==================================+ -|| xCAT 2.14.2 2018/7/13 |- ubuntu18.04 | | | +|| xCAT 2.14.2 2018/7/13 |- Ubuntu 18.04 | | | || | | | | | `2.14.2 Release Notes `_ | | | | +---------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.14.1 |- RHV4.2 + | |- OpenBMC in python enhance: | +|| xCAT 2.14.1 |- RHV 4.2 + | |- OpenBMC in python enhancement: | || 2018/6/1 | RHEL7.5 + p8 | | | -|| | | | rinv enhance,issue #5176 | +|| | | | rinv enhance, issue #5176 | | `2.14.1 Release Notes `_ | | | | -| | | |- Discover process enhance | +| | | |- Discover process enhancement | | | | | | -| | | |- xcatprobe `xcatmn` enhance | +| | | |- xcatprobe `xcatmn` enhancement | | | | | | -| | | |- xcat-inventory enhance(beta) | +| | | |- xcat-inventory enhancement(beta)| | | | | | | | | |- goconserver v0.2.2 | +---------------------------------+---------------+-------------+----------------------------------+ @@ -74,7 +74,7 @@ xCAT 2.13.x +---------------------------------+---------------+-------------+----------------------------------+ || xCAT 2.13.9 | | |- OpenBMC support: | || 2017/12/18 | | | | -|| | | | rflash -a/-u enhance, add -d | +|| | | | rflash -a/-u enhancement, add -d| | `2.13.9 Release Notes `_ | | | | @@ -91,7 +91,8 @@ xCAT 2.13.x | /XCAT_2.13.8_Release_Notes>`_ | | | | | | | |- The document of MN HA | | | | | | -| | | |- nodeset enhance for multi-nodes | +| | | |- nodeset enhancement for | +| | | | multi-nodes | +---------------------------------+---------------+-------------+----------------------------------+ || xCAT 2.13.7 | | |- OpenBMC support: | || 2017/9/22 | | | | @@ -99,7 +100,8 @@ xCAT 2.13.x | `2.13.7 Release Notes `_ | | | | -| | | |- xcatprobe clusterstatus enhance | +| | | |- xcatprobe clusterstatus | +| | | | enhancement | | | | | | | | | |- PDU support: discover, config | | | | | |