From fd18e34791df72eb9273e2266cbb33fb10592de5 Mon Sep 17 00:00:00 2001 From: Tabitha Date: Wed, 21 Oct 2020 15:12:05 +0100 Subject: [PATCH] Removes unprovided kuryr-cni.conf file docs The kuryr-cni.conf file was removed and is no longer provided in the ConfigMap (kuryr-config). The only file present in the ConfigMap is the kuryr.conf file. The Kuryr-Kubernetes documentation for containerized installation and how to enable ports pool support was updated to reflect this change. Change-Id: I1afbd1db9e90727b2f3dbed3a1341f99550b3a2b Closes-Bug: #1900723 --- doc/source/installation/devstack/containerized.rst | 7 ++----- doc/source/installation/ports-pool.rst | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/doc/source/installation/devstack/containerized.rst b/doc/source/installation/devstack/containerized.rst index 01eb77ce9..a4866d181 100644 --- a/doc/source/installation/devstack/containerized.rst +++ b/doc/source/installation/devstack/containerized.rst @@ -40,11 +40,8 @@ associated ConfigMap. On DevStack deployment this can be done using: $ kubectl -n kube-system edit cm kuryr-config -Then the editor will appear that will let you edit the config map. Make sure to -keep correct indentation when doing changes. Also note that there are two files -present in the ConfigMap: kuryr.conf and kuryr-cni.conf. First one is attached -to kuryr-controller and second to kuryr-cni. Make sure to modify both when -doing changes important for both services. +Then the editor will appear that will let you edit the ConfigMap. Make sure to +keep correct indentation when doing changes. Restarting services diff --git a/doc/source/installation/ports-pool.rst b/doc/source/installation/ports-pool.rst index fcfd6185d..08b57b1bc 100644 --- a/doc/source/installation/ports-pool.rst +++ b/doc/source/installation/ports-pool.rst @@ -71,10 +71,9 @@ ConfigMap to change the kuryr.conf files with: $ kubectl -n kube-system edit cm kuryr-config -Then modify the kuryr.conf (not the kuryr-cni.conf) to modify the controller -configuration regarding the pools. After that, to have the new configuration -applied you need to restart the kuryr-controller just by killing the existing -pod: +Then modify the kuryr.conf to modify the controller configuration regarding +the pools. After that, to have the new configuration applied you need to +restart the kuryr-controller just by killing the existing pod: .. code-block:: console