openstack/openstack-helm
Code Issues Proposed changes

Clarify type of auto_bridge_add

Browse Source 
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
This commit is contained in:
Chris Wedgwood 2017-10-03 18:24:49 +00:00
parent e5304b45e0
commit cb28c05da5
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
neutron/values.yaml
View File

@ -69,16 +69,21 @@ 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:
# 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
auto_bridge_add:
# br0: if0
# br1: iface_two
server:

12
openvswitch/values.yaml
View File

@ -35,11 +35,15 @@ 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:
# 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
auto_bridge_add:
# br0: if0
# br1: iface_two