From c78e7efa7b786f1e4170d025676a0dc69b20ad53 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Thu, 14 Jul 2022 17:55:45 +0200 Subject: docs: Update package references in debian/ubuntu related docs. On the back of changing the debian/ubuntu packaging, update the docs to refer to existing packages. Signed-off-by: Frode Nordahl Signed-off-by: Ilya Maximets --- Documentation/intro/install/distributions.rst | 22 +++++++++------------- Documentation/tutorials/ipsec.rst | 19 +++---------------- 2 files changed, 12 insertions(+), 29 deletions(-) (limited to 'Documentation') diff --git a/Documentation/intro/install/distributions.rst b/Documentation/intro/install/distributions.rst index b68a764d1..ce75ac45c 100644 --- a/Documentation/intro/install/distributions.rst +++ b/Documentation/intro/install/distributions.rst @@ -33,24 +33,20 @@ architectures. The packaged version available with distributions may not be latest Open vSwitch release. -Debian -------- +Debian / Ubuntu +--------------- You can use ``apt-get`` or ``aptitude`` to install the .deb packages and must be superuser. -1. Debian has ``openvswitch-switch`` and ``openvswitch-common`` .deb packages -that includes the core userspace components of the switch. - -2. For kernel datapath, ``openvswitch-datapath-dkms`` can be installed to -automatically build and install Open vSwitch kernel module for your running -kernel. This package is only available when the .deb packages are built from -the Open vSwitch repository; it is not downstream in Debian or Ubuntu releases. +1. Debian and Ubuntu has ``openvswitch-switch`` and ``openvswitch-common`` +packages that includes the core userspace components of the switch. Extra +packages for documentation, ipsec, pki, VTEP and Python support are also +available. The Open vSwitch kernel datapath is maintained as part of the +upstream kernel available in the distribution. -3. For fast userspace switching, Open vSwitch with DPDK support is -bundled in the package ``openvswitch-switch-dpdk``. This package is only -available in the Ubuntu distribution; it is not upstream in the Open vSwitch -repository or downstream in Debian. +2. For fast userspace switching, Open vSwitch with DPDK support is +bundled in the package ``openvswitch-switch-dpdk``. Fedora ------ diff --git a/Documentation/tutorials/ipsec.rst b/Documentation/tutorials/ipsec.rst index 7088f9036..9d6cc7779 100644 --- a/Documentation/tutorials/ipsec.rst +++ b/Documentation/tutorials/ipsec.rst @@ -42,28 +42,15 @@ Installing OVS and IPsec Packages --------------------------------- OVS IPsec has .deb and .rpm packages. You should use the right package -based on your Linux distribution. This tutorial uses Ubuntu 16.04 and Fedora 32 +based on your Linux distribution. This tutorial uses Ubuntu 22.04 and Fedora 32 as examples. Ubuntu ~~~~~~ -1. Follow :doc:`/intro/install/debian` to build debian packages. +1. Install the related packages:: - .. note:: - - If you have already installed OVS, then you only need to install - openvswitch-pki_*.deb and openvswitch-ipsec_*.deb in the following step. - If your kernel version is below v4.13.0, update your kernel to v4.13.0 or - above. - -2. Install the related packages:: - - # apt-get install dkms strongswan - # dpkg -i libopenvswitch_*.deb openvswitch-common_*.deb \ - openvswitch-switch_*.deb openvswitch-datapath-dkms_*.deb \ - python-openvswitch_*.deb openvswitch-pki_*.deb \ - openvswitch-ipsec_*.deb + # apt-get install openvswitch-ipsec If the installation is successful, you should be able to see the ovs-monitor-ipsec daemon is running in your system. -- cgit v1.2.1