From a44ab387b5650915e9f762a68082020553a4b7ae Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Mon, 19 Mar 2018 10:26:03 -0500 Subject: [PATCH] Document usage of pod dependencies Replace references to daemonset dependencies with pod dependencies in docs. Change-Id: I252089006929d7e218ebfc4f98d49c4650143a7e --- doc/source/devref/networking.rst | 26 ++++++++++++------- .../specs/support-linux-bridge-on-neutron.rst | 18 ++++++++----- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/doc/source/devref/networking.rst b/doc/source/devref/networking.rst index 8275c8531c..fc5d7f129f 100644 --- a/doc/source/devref/networking.rst +++ b/doc/source/devref/networking.rst @@ -137,9 +137,11 @@ for the L2 agent daemonset: endpoint: internal - service: compute endpoint: internal - daemonset: - # this should be set to corresponding neutron L2 agent - - neutron-ovs-agent + pod: + # this should be set to corresponding neutron L2 agent + - labels: + application: neutron + component: neutron-ovs-agent There is also a need for DHCP agent to pass ovs agent config file (in :code:`neutron/templates/bin/_neutron-dhcp-agent.sh.tpl`): @@ -317,14 +319,20 @@ and use this `neutron/values.yaml` override: backend: linuxbridge dependencies: dhcp: - daemonset: - - neutron-lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent metadata: - daemonset: - - neutron-lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent l3: - daemonset: - - neutron-lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent conf: neutron: DEFAULT diff --git a/doc/source/specs/support-linux-bridge-on-neutron.rst b/doc/source/specs/support-linux-bridge-on-neutron.rst index 0386e11206..713af3eac4 100644 --- a/doc/source/specs/support-linux-bridge-on-neutron.rst +++ b/doc/source/specs/support-linux-bridge-on-neutron.rst @@ -98,14 +98,20 @@ updated to reflect the new kind on L2 agent: dependencies: dhcp: - daemonset: - - lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent metadata: - daemonset: - - lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent l3: - daemonset: - - lb-agent + pod: + - labels: + application: neutron + component: neutron-lb-agent LinuxBridge should be also enabled in :code:`manifests` section: