From f32160bbcefe11d66dd6dec286b335bbb9c73316 Mon Sep 17 00:00:00 2001 From: Yossi Boaron Date: Wed, 20 Jun 2018 11:40:11 +0300 Subject: [PATCH] OCP-Router: Update Devref documentation This patch updates Ingress design Devref with the latest changes in Kuryr's Ingress controller configuration options. Change-Id: Iaaeaee393f0837276994a24c258c4080a0e2ef04 Closes-Bug: 1777821 --- doc/source/devref/kuryr_kubernetes_ingress_design.rst | 9 ++++----- kuryr_kubernetes/controller/ingress/ingress_ctl.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/source/devref/kuryr_kubernetes_ingress_design.rst b/doc/source/devref/kuryr_kubernetes_ingress_design.rst index 5ad5a593e..56e0f215c 100644 --- a/doc/source/devref/kuryr_kubernetes_ingress_design.rst +++ b/doc/source/devref/kuryr_kubernetes_ingress_design.rst @@ -92,14 +92,13 @@ IP (allocated from 'external_svc_subnet'). The following parameters should be configured in kuryr.conf file to enable L7 Router:: - [neutron_defaults] - external_svc_subnet=external_subnet_id - l7_router_ip= (e.g: 172.24.4.13) + [ingress] + l7_router_uuid= [kubernetes] enable_ingress = True + # make sure that 'ingresslb' appears in enabled_handlers + enabled_handlers= vif,lb,lbaasspec,ingresslb -In case L7 router is enabled in kuryr.conf, the kuryr-kubernetes controller -should create it only if it doesn't exist. The L7 Router should notify the Health Manager upon any failure that could lead to L7 Router's malfunctionality. diff --git a/kuryr_kubernetes/controller/ingress/ingress_ctl.py b/kuryr_kubernetes/controller/ingress/ingress_ctl.py index d80187f51..85aabc07e 100644 --- a/kuryr_kubernetes/controller/ingress/ingress_ctl.py +++ b/kuryr_kubernetes/controller/ingress/ingress_ctl.py @@ -116,7 +116,7 @@ class IngressCtrlr(object): def _is_ingress_controller_disabled(self): # Note(yboaron) To enable the ingress controller admin should : - # A. Set the L7 router's FIP in kuryr.conf + # A. Set the L7-router/LB UUID in kuryr.conf # and # B. Add K8S-ingress and OCP-route handlers to pluggable # handlers list