From cb28c05da5e2003263d4b4be2db1813033f070fb Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Tue, 3 Oct 2017 18:24:49 +0000
Subject: [PATCH] Clarify type of auto_bridge_add
With auto_bridge_add defined as:
auto_bridge_add:
# nothing here
helm doesn't treat is as am empty table so issues warnings such as:
2017/10/03 19:24:37 warning: destination for auto_bridge_add is a table. Ignoring non-table value <nil>
This happens most of the time as we use `helm --values=...` to augment
values.yaml in the chart.
This change clarifies it is indeed a table and the warnings no long
appear.
Change-Id: Ib733ed72df49e134a9199e4024b2893629b990dc
---
neutron/values.yaml | 25 +++++++++++++++----------
openvswitch/values.yaml | 18 +++++++++++-------
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/neutron/values.yaml b/neutron/values.yaml
index d2cbf8f0f2..c36b68ced8 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -69,18 +69,23 @@ network:
external_bridge: br-ex
ip_address: 0.0.0.0
interface:
- # External interface will be automatically added to external_bridge. Default is null.
- # Tunnel interface will be used for VXLAN tunneling. Default is null, with
- # fallback mechanism to search for interface with default routing.
+ # External interface will be automatically added to external_bridge.
+ # Tunnel interface will be used for VXLAN tunneling. If null
+ # (default) there is a fallback mechanism to search for interface
+ # with default routing.
external: null
tunnel: null
- # To automatically add a physical interface to a specific bridge using,
- # for example eth3 to bridge br-physnet1 define the following key/value
- # in auto_bridge_add:
- # br-physnet1: eth3
- auto_bridge_add:
- # br0: if0
- # br1: iface_two
+ # auto_bridge_add is a table of "bridge: interface" pairs, by
+ # default empty
+ auto_bridge_add: {}
+ # To automatically add a physical interfaces to a specific bridges,
+ # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two
+ # to br1 do something like:
+ #
+ # auto_bridge_add:
+ # br-physnet1: eth3
+ # br0: if0
+ # br1: iface_two
server:
port: 9696
ingress:
diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index 0b43fe449f..be162cd0ba 100644
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@@ -35,13 +35,17 @@ network:
interface:
# External interface will be automatically added to external_bridge. Default is null.
external: null
- # To automatically add a physical interface to a specific bridge using,
- # for example eth3 to bridge br-physnet1 define the following key/value
- # in auto_bridge_add:
- # br-physnet1: eth3
- auto_bridge_add:
- # br0: if0
- # br1: iface_two
+ # auto_bridge_add is a table of "bridge: interface" pairs, by
+ # default empty
+ auto_bridge_add: {}
+ # To automatically add a physical interfaces to a specific bridges,
+ # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two
+ # to br1 do something like:
+ #
+ # auto_bridge_add:
+ # br-physnet1: eth3
+ # br0: if0
+ # br1: iface_two
pod:
lifecycle: