diff --git a/doc/common/app-support.rst b/doc/common/app-support.rst index 61492745b2..a7c27a5d41 100644 --- a/doc/common/app-support.rst +++ b/doc/common/app-support.rst @@ -29,18 +29,10 @@ join our IRC channel ``#openstack-doc`` on the freenode IRC network, or `report a bug `_. -The following books explain how to install an OpenStack cloud and its +The following guides explain how to install an OpenStack cloud and its associated components: -* `Installation Tutorial for openSUSE Leap 42.2 and SUSE Linux Enterprise - Server 12 SP2 - `_ - -* `Installation Tutorial for Red Hat Enterprise Linux 7 and CentOS 7 - `_ - -* `Installation Tutorial for Ubuntu 16.04 (LTS) - `_ +* `OpenStack Pike Installation Tutorials and Guides `_ The following books explain how to configure and run an OpenStack cloud: @@ -48,7 +40,7 @@ The following books explain how to configure and run an OpenStack cloud: * `Administrator Guide `_ -* `Configuration Reference `_ +* `Configuration Reference `_ * `Networking Guide `_ diff --git a/doc/install-guide/source/environment-packages-obs.rst b/doc/install-guide/source/environment-packages-obs.rst index 683a841b47..3bc965b85c 100644 --- a/doc/install-guide/source/environment-packages-obs.rst +++ b/doc/install-guide/source/environment-packages-obs.rst @@ -21,19 +21,17 @@ these procedures on all nodes. impact your OpenStack environment. - - Enable the OpenStack repository ------------------------------- * Enable the Open Build Service repositories based on your openSUSE or - SLES version: + SLES version, and on the version of OpenStack you want to install: - **On openSUSE:** + **On openSUSE for OpenStack Pike:** .. code-block:: console - # zypper addrepo -f obs://Cloud:OpenStack:Ocata/openSUSE_Leap_42.2 Ocata + # zypper addrepo -f obs://Cloud:OpenStack:Pike/openSUSE_Leap_42.3 Pike .. end @@ -52,11 +50,11 @@ Enable the OpenStack repository .. end - **On SLES:** + **On SLES for OpenStack Pike:** .. code-block:: console - # zypper addrepo -f obs://Cloud:OpenStack:Ocata/SLE_12_SP2 Ocata + # zypper addrepo -f obs://Cloud:OpenStack:Pike/SLE_12_SP3 Pike .. end @@ -79,10 +77,7 @@ Enable the OpenStack repository Finalize the installation ------------------------- -1. Upgrade the packages on all nodes: - - - +#. Upgrade the packages on all nodes: .. code-block:: console @@ -90,16 +85,12 @@ Finalize the installation .. end - .. note:: If the upgrade process includes a new kernel, reboot your host to activate it. -2. Install the OpenStack client: - - - +#. Install the OpenStack client: .. code-block:: console diff --git a/doc/install-guide/source/preface.rst b/doc/install-guide/source/preface.rst index b5d537d3a0..3f44d136e5 100644 --- a/doc/install-guide/source/preface.rst +++ b/doc/install-guide/source/preface.rst @@ -60,8 +60,8 @@ openSUSE and SUSE Linux Enterprise Server +++++++++++++++++++++++++++++++++++++++++ This guide will show you how to install OpenStack by using packages -on openSUSE Leap 42.2 and SUSE Linux Enterprise Server 12 - for -both SP1 and SP2 - through the Open Build Service Cloud repository. +on openSUSE Leap 42.3 and SUSE Linux Enterprise Server 12 SP3 +through the Open Build Service Cloud repository. Red Hat Enterprise Linux and CentOS +++++++++++++++++++++++++++++++++++