From b480d7106e54f577d4d5819cbbce157f86f94fdb Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Fri, 28 Feb 2025 10:30:11 +0000 Subject: [PATCH] Fix the installation document about removal of --cluster-store Starting from stable/2024.1, we no longer need a cluster store for docker. Therefore, we change the installation steps as follows: * Remove the --cluster-store option from Docker * Remove the etcd requirement (since we don't need to use it as cluster store). * Switch capability_scope to "local" (the default) in kuryr-libnetwork. Related-Bug: #2007142 Change-Id: I5cb0df5c0c65a4e54841ffb9e8450b21446a5fdd --- doc/source/install/compute-install.rst | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/source/install/compute-install.rst b/doc/source/install/compute-install.rst index ad17b6eea..dc3de3885 100644 --- a/doc/source/install/compute-install.rst +++ b/doc/source/install/compute-install.rst @@ -15,13 +15,10 @@ Prerequisites ------------- Before you install and configure Zun, you must have Docker and -Kuryr-libnetwork installed properly in the compute node, and have Etcd -installed properly in the controller node. Refer `Get Docker +Kuryr-libnetwork installed properly in the compute node. Refer `Get Docker `_ for Docker installation and `Kuryr libnetwork installation guide -`_, -`Etcd installation guide -`_ +`_ Install and configure components -------------------------------- @@ -218,13 +215,13 @@ Install and configure components * Create the file ``/etc/systemd/system/docker.service.d/docker.conf``. Configure docker to listen to port 2375 as well as the default - unix socket. Also, configure docker to use etcd3 as storage backend: + unix socket: .. code-block:: ini [Service] ExecStart= - ExecStart=/usr/bin/dockerd --group zun -H tcp://compute1:2375 -H unix:///var/run/docker.sock --cluster-store etcd://controller:2379 + ExecStart=/usr/bin/dockerd --group zun -H tcp://compute1:2375 -H unix:///var/run/docker.sock * Restart Docker: @@ -234,14 +231,12 @@ Install and configure components # systemctl restart docker * Edit the Kuryr config file ``/etc/kuryr/kuryr.conf``. - Set ``capability_scope`` to ``global`` and - ``process_external_connectivity`` to ``False``: + Set ``process_external_connectivity`` to ``False``: .. code-block:: ini [DEFAULT] ... - capability_scope = global process_external_connectivity = False * Restart Kuryr-libnetwork: @@ -427,7 +422,7 @@ additional configuration steps. [Service] ExecStart= - ExecStart=/usr/bin/dockerd --group zun -H tcp://compute1:2375 -H unix:///var/run/docker.sock --cluster-store etcd://controller:2379 --add-runtime kata=/usr/bin/kata-runtime + ExecStart=/usr/bin/dockerd --group zun -H tcp://compute1:2375 -H unix:///var/run/docker.sock --add-runtime kata=/usr/bin/kata-runtime * Restart Docker: