From 35dea078974261e83f594e798855893401a53511 Mon Sep 17 00:00:00 2001 From: LinPeiWen <591171850@qq.com> Date: Mon, 10 May 2021 08:15:54 +0000 Subject: [PATCH] Delete unavailable py2 package The openstack Ussuri and Victoria versions no longer support the Centos7 and pyrhon2 environment packages. Correct the missing problems in the latest document Change-Id: I60787243fdc6ed2741522355ec79970bdb912f41 --- doc/source/admin/console.rst | 18 ++------- doc/source/install/configure-cleaning.rst | 2 +- doc/source/install/configure-compute.rst | 4 +- doc/source/install/configure-pxe.rst | 38 ++++++------------- .../install/configure-tenant-networks.rst | 2 +- doc/source/install/enabling-https.rst | 4 +- .../include/configure-ironic-api-mod_wsgi.inc | 10 ++--- .../install/include/configure-ironic-api.inc | 2 +- doc/source/install/install-obs.rst | 2 +- doc/source/install/install-rdo.rst | 16 ++------ doc/source/install/install-ubuntu.rst | 2 +- 11 files changed, 30 insertions(+), 70 deletions(-) diff --git a/doc/source/admin/console.rst b/doc/source/admin/console.rst index 82f63ca983..b3fcd91f7f 100644 --- a/doc/source/admin/console.rst +++ b/doc/source/admin/console.rst @@ -33,11 +33,7 @@ The web console can be configured in Bare Metal service in the following way: sudo apt-get install shellinabox - RHEL7/CentOS7:: - - sudo yum install shellinabox - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install shellinabox @@ -52,11 +48,7 @@ The web console can be configured in Bare Metal service in the following way: sudo apt-get install openssl - RHEL7/CentOS7:: - - sudo yum install openssl - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install openssl @@ -181,11 +173,7 @@ Serial consoles can be configured in the Bare Metal service as follows: sudo apt-get install socat - RHEL7/CentOS7:: - - sudo yum install socat - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install socat diff --git a/doc/source/install/configure-cleaning.rst b/doc/source/install/configure-cleaning.rst index 8579f53b04..b7a29e3206 100644 --- a/doc/source/install/configure-cleaning.rst +++ b/doc/source/install/configure-cleaning.rst @@ -29,7 +29,7 @@ Configure the Bare Metal service for cleaning .. code-block:: console - Fedora/RHEL7/CentOS7/SUSE: + Fedora/RHEL8/CentOS8/SUSE: sudo systemctl restart openstack-ironic-conductor Ubuntu: diff --git a/doc/source/install/configure-compute.rst b/doc/source/install/configure-compute.rst index 631cb0b6e7..299b4a5ea1 100644 --- a/doc/source/install/configure-compute.rst +++ b/doc/source/install/configure-compute.rst @@ -137,7 +137,7 @@ service's controller nodes and compute nodes. .. code-block:: console - Fedora/RHEL7/CentOS7/SUSE: + Fedora/RHEL8/CentOS8/SUSE: sudo systemctl restart openstack-nova-scheduler Ubuntu: @@ -148,7 +148,7 @@ service's controller nodes and compute nodes. .. code-block:: console - Fedora/RHEL7/CentOS7/SUSE: + Fedora/RHEL8/CentOS8/SUSE: sudo systemctl restart openstack-nova-compute Ubuntu: diff --git a/doc/source/install/configure-pxe.rst b/doc/source/install/configure-pxe.rst index 0f5f392a2f..01cd7d2427 100644 --- a/doc/source/install/configure-pxe.rst +++ b/doc/source/install/configure-pxe.rst @@ -58,11 +58,7 @@ set up on the Bare Metal service nodes which run the ``ironic-conductor``. sudo apt-get install xinetd tftpd-hpa - RHEL7/CentOS7:: - - sudo yum install tftp-server xinetd - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install tftp-server xinetd @@ -94,7 +90,7 @@ set up on the Bare Metal service nodes which run the ``ironic-conductor``. sudo service xinetd restart - Fedora/RHEL7/CentOS7/SUSE:: + Fedora/RHEL8/CentOS8/SUSE:: sudo systemctl restart xinetd @@ -131,11 +127,7 @@ the PXE UEFI environment. sudo apt-get install grub-efi-amd64-signed shim-signed - RHEL7/CentOS7:: - - sudo yum install grub2-efi shim - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install grub2-efi shim @@ -155,7 +147,7 @@ the PXE UEFI environment. sudo cp /boot/efi/EFI/fedora/shim.efi /tftpboot/bootx64.efi sudo cp /boot/efi/EFI/fedora/grubx64.efi /tftpboot/grubx64.efi - RHEL7/CentOS7:: + RHEL8/CentOS8:: sudo cp /boot/efi/EFI/centos/shim.efi /tftpboot/bootx64.efi sudo cp /boot/efi/EFI/centos/grubx64.efi /tftpboot/grubx64.efi @@ -175,7 +167,7 @@ the PXE UEFI environment. GRUB_DIR=/tftpboot/EFI/fedora - RHEL7/CentOS7: Create grub.cfg under ``/tftpboot/EFI/centos`` directory:: + RHEL8/CentOS8: Create grub.cfg under ``/tftpboot/EFI/centos`` directory:: GRUB_DIR=/tftpboot/EFI/centos @@ -222,11 +214,7 @@ mode, perform these additional steps on the ironic conductor node. sudo apt-get install syslinux-common pxelinux - RHEL7/CentOS7:: - - sudo yum install syslinux-tftpboot - - Fedora:: + RHEL8/CentOS8/Fedora:: sudo dnf install syslinux-tftpboot @@ -240,7 +228,7 @@ mode, perform these additional steps on the ironic conductor node. sudo cp /usr/lib/PXELINUX/pxelinux.0 /tftpboot - RHEL7/CentOS7/SUSE:: + RHEL8/CentOS8/SUSE:: sudo cp /usr/share/syslinux/pxelinux.0 /tftpboot @@ -255,7 +243,7 @@ mode, perform these additional steps on the ironic conductor node. sudo cp /boot/extlinux/chain.c32 /tftpboot - RHEL7/CentOS7/SUSE:: + RHEL8/CentOS8/SUSE:: sudo cp /usr/share/syslinux/chain.c32 /tftpboot/ @@ -340,11 +328,7 @@ on the Bare Metal service node(s) where ``ironic-conductor`` is running. apt-get install ipxe - RHEL7/CentOS7:: - - yum install ipxe-bootimgs - - Fedora:: + RHEL8/CentOS8/Fedora:: dnf install ipxe-bootimgs @@ -362,7 +346,7 @@ on the Bare Metal service node(s) where ``ironic-conductor`` is running. cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi,snponly.efi} /tftpboot - Fedora/RHEL7/CentOS7:: + Fedora/RHEL8/CentOS8:: cp /usr/share/ipxe/{undionly.kpxe,ipxe.efi,snponly.efi} /tftpboot @@ -455,7 +439,7 @@ on the Bare Metal service node(s) where ``ironic-conductor`` is running. #. Restart the ``ironic-conductor`` process: - Fedora/RHEL7/CentOS7/SUSE:: + Fedora/RHEL8/CentOS8/SUSE:: sudo systemctl restart openstack-ironic-conductor diff --git a/doc/source/install/configure-tenant-networks.rst b/doc/source/install/configure-tenant-networks.rst index 6fca4cd50d..7553d57ff8 100644 --- a/doc/source/install/configure-tenant-networks.rst +++ b/doc/source/install/configure-tenant-networks.rst @@ -139,7 +139,7 @@ provisioning will happen in a multi-tenant environment (which means using the #. Restart the ironic-conductor and ironic-api services after the modifications: - - Fedora/RHEL7/CentOS7:: + - Fedora/RHEL8/CentOS8:: sudo systemctl restart openstack-ironic-api sudo systemctl restart openstack-ironic-conductor diff --git a/doc/source/install/enabling-https.rst b/doc/source/install/enabling-https.rst index 81abbc1219..3b49ffd586 100644 --- a/doc/source/install/enabling-https.rst +++ b/doc/source/install/enabling-https.rst @@ -34,7 +34,7 @@ It can be enabled by making the following changes to ``/etc/glance/glance-api.co #. Restart the glance-api service:: - Fedora/RHEL7/CentOS7/SUSE: + Fedora/RHEL8/CentOS8/SUSE: sudo systemctl restart openstack-glance-api Debian/Ubuntu: @@ -86,7 +86,7 @@ To enable secure HTTPS communication between Bare Metal service and Image servic #. Restart ironic-conductor service:: - Fedora/RHEL7/CentOS7/SUSE: + Fedora/RHEL8/CentOS8/SUSE: sudo systemctl restart openstack-ironic-conductor Debian/Ubuntu: diff --git a/doc/source/install/include/configure-ironic-api-mod_wsgi.inc b/doc/source/install/include/configure-ironic-api-mod_wsgi.inc index e881a07692..235cf1baab 100644 --- a/doc/source/install/include/configure-ironic-api-mod_wsgi.inc +++ b/doc/source/install/include/configure-ironic-api-mod_wsgi.inc @@ -6,11 +6,7 @@ Bare Metal service comes with an example file for configuring the #. Install the apache service: - RHEL7/CentOS7:: - - sudo yum install httpd - - Fedora:: + Fedora/RHEL8/CentOS8:: sudo dnf install httpd @@ -27,7 +23,7 @@ Bare Metal service comes with an example file for configuring the `Ironic project tree `_ and copy it to the apache sites: - Fedora/RHEL7/CentOS7:: + Fedora/RHEL8/CentOS8:: sudo cp etc/apache2/ironic /etc/httpd/conf.d/ironic.conf @@ -58,7 +54,7 @@ Bare Metal service comes with an example file for configuring the #. Enable the apache ``ironic`` in site and reload: - Fedora/RHEL7/CentOS7:: + Fedora/RHEL8/CentOS8:: sudo systemctl reload httpd diff --git a/doc/source/install/include/configure-ironic-api.inc b/doc/source/install/include/configure-ironic-api.inc index 301558a4b0..713ef2b9ce 100644 --- a/doc/source/install/include/configure-ironic-api.inc +++ b/doc/source/install/include/configure-ironic-api.inc @@ -120,7 +120,7 @@ Configuring ironic-api service #. Restart the ironic-api service: - Fedora/RHEL7/CentOS7/SUSE:: + Fedora/RHEL8/CentOS8/SUSE:: sudo systemctl restart openstack-ironic-api diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst index be50d39cac..8dcef32cb4 100644 --- a/doc/source/install/install-obs.rst +++ b/doc/source/install/install-obs.rst @@ -21,7 +21,7 @@ Install and configure components .. code-block:: console - # zypper install openstack-ironic-api openstack-ironic-conductor python-ironicclient + # zypper install openstack-ironic-api openstack-ironic-conductor python3-ironicclient #. Enable services diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst index ccf3fc1331..e1e53beede 100644 --- a/doc/source/install/install-rdo.rst +++ b/doc/source/install/install-rdo.rst @@ -6,26 +6,18 @@ Install and configure for Red Hat Enterprise Linux and CentOS This section describes how to install and configure the Bare Metal service -for Red Hat Enterprise Linux 7 and CentOS 7. +for Red Hat Enterprise Linux 8 and CentOS 8. .. include:: include/common-prerequisites.inc Install and configure components ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. Install from packages +#. Install from packages (using dnf) - - Using ``dnf`` + .. code-block:: console - .. code-block:: console - - # dnf install openstack-ironic-api openstack-ironic-conductor python-ironicclient - - - Using ``yum`` - - .. code-block:: console - - # yum install openstack-ironic-api openstack-ironic-conductor python-ironicclient + # dnf install openstack-ironic-api openstack-ironic-conductor python3-ironicclient #. Enable services diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst index 92c8fc6d31..2d7e6faf29 100644 --- a/doc/source/install/install-ubuntu.rst +++ b/doc/source/install/install-ubuntu.rst @@ -16,7 +16,7 @@ Install and configure components .. code-block:: console - # apt-get install ironic-api ironic-conductor python-ironicclient + # apt-get install ironic-api ironic-conductor python3-ironicclient #. Enable services