diff --git a/doc/source/admin/hitachi_hnas_driver.rst b/doc/source/admin/hitachi_hnas_driver.rst index 5d64e491d0..ea4cd54c5a 100644 --- a/doc/source/admin/hitachi_hnas_driver.rst +++ b/doc/source/admin/hitachi_hnas_driver.rst @@ -280,8 +280,8 @@ Restart all Shared File Systems services (manila-share, manila-scheduler and manila-api) and neutron services (neutron-\*). This step is specific to your environment. If you are running in devstack for example, you have to log into screen (``screen -r``), stop the process (``Ctrl^C``) and run it again. If you -are running it in a distro like RHEL or SUSE, a service command (for example -*service manila-api restart*) is used to restart the service. +are running it in a distro like RHEL, a systemd command (for example +*systemctl restart manila-api*) is used to restart the service. Step 5 - Configure OpenStack Networks ************************************* diff --git a/doc/source/configuration/shared-file-systems/log-files.rst b/doc/source/configuration/shared-file-systems/log-files.rst index 6dbed9f8a4..5ebcc046dc 100644 --- a/doc/source/configuration/shared-file-systems/log-files.rst +++ b/doc/source/configuration/shared-file-systems/log-files.rst @@ -10,8 +10,7 @@ runs. :header-rows: 1 * - Log file - - Service/interface (for CentOS, Fedora, openSUSE, Red Hat Enterprise - Linux, and SUSE Linux Enterprise) + - Service/interface (for CentOS, Fedora and Red Hat Enterprise Linux) - Service/interface (for Ubuntu and Debian) * - ``api.log`` - ``openstack-manila-api`` diff --git a/doc/source/contributor/apache-httpd.rst b/doc/source/contributor/apache-httpd.rst index e04ee0843b..0eee2cddbf 100644 --- a/doc/source/contributor/apache-httpd.rst +++ b/doc/source/contributor/apache-httpd.rst @@ -28,10 +28,6 @@ On RHEL/CentOS/Fedora it is:: /etc/httpd/conf.d/uwsgi-manila.conf -On SLES/OpenSUSE it is:: - - /etc/apache2/vhosts.d/uwsgi-manila.conf - On Debian/Ubuntu it is:: /etc/apache2/sites-available/uwsgi-manila.conf @@ -56,10 +52,6 @@ On RHEL/CentOS/Fedora:: sudo dnf install uwsgi-plugin-python3 -On SLES/OpenSUSE:: - - sudo zypper install uwsgi-python3 - On Ubuntu/Debian:: sudo apt-get install uwsgi-plugin-python3 @@ -83,10 +75,6 @@ On RHEL/CentOS/Fedora it is:: /etc/httpd/conf.d/mod_wsgi-manila.conf -On SLES/OpenSUSE it is:: - - /etc/apache2/vhosts.d/mod_wsgi-manila.conf - On Debian/Ubuntu it is:: /etc/apache2/sites-available/mod_wsgi-manila.conf diff --git a/doc/source/install/install-controller-node.rst b/doc/source/install/install-controller-node.rst index e68c20d355..d4be1013d7 100644 --- a/doc/source/install/install-controller-node.rst +++ b/doc/source/install/install-controller-node.rst @@ -16,7 +16,6 @@ Note that installation and configuration vary by distribution. .. toctree:: :maxdepth: 1 - install-controller-obs.rst install-controller-rdo.rst install-controller-ubuntu.rst install-controller-debian.rst diff --git a/doc/source/install/install-controller-obs.rst b/doc/source/install/install-controller-obs.rst deleted file mode 100644 index d7750222d7..0000000000 --- a/doc/source/install/install-controller-obs.rst +++ /dev/null @@ -1,47 +0,0 @@ -.. _manila-controller-obs: - -Install and configure controller node on openSUSE and SUSE Linux Enterprise -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This section describes how to install and configure the Shared File Systems -service, code-named manila, on the controller node that runs openSUSE and SUSE -Linux Enterprise. This service requires at least one additional share node -that manages file storage back ends. - -.. include:: common/controller-node-prerequisites.rst - -Install and configure components --------------------------------- - -#. Install the packages: - - .. code-block:: console - - # zypper install openstack-manila-api openstack-manila-scheduler python-manilaclient - -#. Edit the ``/etc/manila/manila.conf`` file and complete the - following actions: - - * In the ``[database]`` section, configure database access: - - .. code-block:: ini - - [database] - ... - connection = mysql+pymysql://manila:MANILA_DBPASS@controller/manila - - Replace ``MANILA_DBPASS`` with the password you chose for the Shared - File Systems database. - -.. include:: common/controller-node-common-configuration.rst - -Finalize installation ---------------------- - -#. Start the Shared File Systems services and configure them to start when - the system boots: - - .. code-block:: console - - # systemctl enable openstack-manila-api.service openstack-manila-scheduler.service - # systemctl start openstack-manila-api.service openstack-manila-scheduler.service diff --git a/doc/source/install/install-share-node.rst b/doc/source/install/install-share-node.rst index c3b216f00f..4f07b4f176 100644 --- a/doc/source/install/install-share-node.rst +++ b/doc/source/install/install-share-node.rst @@ -21,7 +21,6 @@ Note that installation and configuration vary by distribution. .. toctree:: :maxdepth: 1 - install-share-obs.rst install-share-rdo.rst install-share-ubuntu.rst install-share-debian.rst diff --git a/doc/source/install/install-share-obs.rst b/doc/source/install/install-share-obs.rst deleted file mode 100644 index 2b12dddc3e..0000000000 --- a/doc/source/install/install-share-obs.rst +++ /dev/null @@ -1,90 +0,0 @@ -.. _share-node-install-obs: - -Install and configure a share node running openSUSE and SUSE Linux Enterprise -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This section describes how to install and configure a share node for the -Shared File Systems service. - -Note that installation and configuration vary by distribution. This section -describes the instructions for a share node running openSUSE and SUSE Linux -Enterprise. - -Install and configure components --------------------------------- - -#. Install the packages: - - .. code-block:: console - - # zypper install openstack-manila-share python-PyMySQL - -#. Edit the ``/etc/manila/manila.conf`` file and complete the following - actions: - - * In the ``[database]`` section, configure database access: - - .. code-block:: ini - - [database] - ... - connection = mysql+pymysql://manila:MANILA_DBPASS@controller/manila - - Replace ``MANILA_DBPASS`` with the password you chose for - the Shared File Systems database. - -.. include:: common/share-node-common-configuration.rst - -Two driver modes ----------------- - -.. include:: common/share-node-share-server-modes.rst - -Choose one of the following options to configure the share driver: - -.. include:: common/dhss-false-mode-intro.rst - -Prerequisites -------------- - -.. note:: - Perform these steps on the storage node. - -#. Install the supporting utility packages: - - * Install LVM and NFS server packages: - - .. code-block:: console - - # zypper install lvm2 nfs-kernel-server - -.. include:: common/dhss-false-mode-configuration.rst - -.. include:: common/dhss-true-mode-intro.rst - -Prerequisites -------------- - -Before you proceed, verify operation of the Compute, Networking, and Block -Storage services. This options requires implementation of Networking option 2 -and requires installation of some Networking service components on the storage -node. - -* Install the Networking service components: - - .. code-block:: console - - # zypper install --no-recommends openstack-neutron-linuxbridge-agent - -.. include:: common/dhss-true-mode-configuration.rst - -Finalize installation ---------------------- -#. Prepare manila-share as start/stop service. Start the Shared File Systems - service including its dependencies and configure them to start when the - system boots: - - .. code-block:: console - - # systemctl enable openstack-manila-share.service tgtd.service - # systemctl start openstack-manila-share.service tgtd.service