diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst index 00b5523706..92b75d6f40 100644 --- a/doc/common-rst/app_support.rst +++ b/doc/common-rst/app_support.rst @@ -28,9 +28,8 @@ associated components: Server 12 `__ -- `Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and - Fedora - 21 `__ +- `Installation Guide for Red Hat Enterprise Linux 7 and CentOS 7 + `__ - `Installation Guide for Ubuntu 14.04 `__ diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml index bcea7954a9..31e1ef4c28 100644 --- a/doc/common/app_support.xml +++ b/doc/common/app_support.xml @@ -40,8 +40,7 @@ Installation Guide for Red Hat - Enterprise Linux 7, CentOS 7, and - Fedora 22 + Enterprise Linux 7 and CentOS 7 diff --git a/doc/install-guide/source/dashboard-install.rst b/doc/install-guide/source/dashboard-install.rst index 9c6f8a5f8f..aab867ffd6 100644 --- a/doc/install-guide/source/dashboard-install.rst +++ b/doc/install-guide/source/dashboard-install.rst @@ -160,8 +160,8 @@ To finalize installation .. only:: rdo - On RHEL and CentOS, configure SELinux to permit the web server - to connect to OpenStack services: + Configure SELinux to permit the web server to connect to OpenStack + services: .. code-block:: console diff --git a/doc/install-guide/source/environment-dependencies.rst b/doc/install-guide/source/environment-dependencies.rst index 20ab6717f9..4f60d0ad07 100644 --- a/doc/install-guide/source/environment-dependencies.rst +++ b/doc/install-guide/source/environment-dependencies.rst @@ -34,17 +34,12 @@ these procedures on all nodes. Prerequisites ------------- - #. On RHEL and CentOS, enable the - `EPEL `_ repository: + #. Enable the `EPEL `_ repository: .. code-block:: console # yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm - .. note:: - - Fedora does not require this repository. - #. On RHEL, enable additional repositories using the subscription manager: @@ -55,7 +50,7 @@ these procedures on all nodes. .. note:: - CentOS and Fedora do not require these repositories. + CentOS does not require these repositories. .. only:: rdo @@ -190,29 +185,6 @@ Finalize the installation # yum install openstack-selinux - .. note:: - - Fedora does not require this package. - - 3. Because Fedora does not provide the ``openstack-selinux`` package - ensure that SELinux is disabled. - - .. code-block:: console - - # sestatus - SELinux status: disabled - - If ``SELinux status`` is ``enabled`` disable SELinux by editing the file - ``/etc/selinux/config`` and restarting the system afterwards: - - .. code-block:: ini - - SELINUX=disabled - - .. note:: - - CentOS and RHEL do not require this step. - Install the OpenStack client ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/install-guide/source/index-debian.rst b/doc/install-guide/source/index-debian.rst index 6cfe0adaf9..3e3a355f23 100644 --- a/doc/install-guide/source/index-debian.rst +++ b/doc/install-guide/source/index-debian.rst @@ -8,9 +8,9 @@ OpenStack Installation Guide for Debian .. only:: rdo - ============================================================================= - OpenStack Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora - ============================================================================= + ==================================================================== + OpenStack Installation Guide for Red Hat Enterprise Linux and CentOS + ==================================================================== .. only:: obs @@ -44,8 +44,8 @@ separately and configure them stand-alone or as connected entities. .. only:: rdo This guide shows you how to install OpenStack by using packages - available through Fedora 22 as well as on Red Hat Enterprise Linux - 7 and its derivatives through the EPEL repository. + available on Red Hat Enterprise Linux 7 and its derivatives through + the EPEL repository. .. only:: ubuntu diff --git a/doc/install-guide/source/index.rst b/doc/install-guide/source/index.rst index 3f7ceb6d71..18f541a3fb 100644 --- a/doc/install-guide/source/index.rst +++ b/doc/install-guide/source/index.rst @@ -8,9 +8,9 @@ .. only:: rdo - ============================================================================= - OpenStack Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora - ============================================================================= + ==================================================================== + OpenStack Installation Guide for Red Hat Enterprise Linux and CentOS + ==================================================================== .. only:: obs @@ -44,8 +44,8 @@ separately and configure them stand-alone or as connected entities. .. only:: rdo This guide shows you how to install OpenStack by using packages - available through Fedora 22 as well as on Red Hat Enterprise Linux - 7 and its derivatives through the EPEL repository. + available on Red Hat Enterprise Linux 7 and its derivatives through + the EPEL repository. .. only:: ubuntu diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html index 41a7dc132b..3e2590ead2 100644 --- a/www/draft/draft-index.html +++ b/www/draft/draft-index.html @@ -68,8 +68,7 @@ Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12 Installation - Guide for Red Hat Enterprise Linux 7, CentOS - 7, and Fedora 22 + Guide for Red Hat Enterprise Linux 7 and CentOS 7 Installation Guide for Ubuntu 14.04 (LTS) Installation diff --git a/www/index.html b/www/index.html index c6a244fa15..18cbed0d3a 100644 --- a/www/index.html +++ b/www/index.html @@ -66,7 +66,7 @@ Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12 Installation Guide for Ubuntu 14.04 (LTS) Installation Guide for Debian 8 (not yet available) - Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 22 (not yet available) + Installation Guide for Red Hat Enterprise Linux 7 and CentOS 7 (not yet available)