diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-16 11:12:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-16 11:12:59 +0000 |
| commit | bce5f65f2e036f6ef5232fdfc8025d7f864faa56 (patch) | |
| tree | f1b889e3aea47f3485bc48e6d8ffb0a0db48f3be /overcloud.yaml | |
| parent | d3cb9359416098309f728845297f263e30aa6e7b (diff) | |
| parent | a2cb9e478d9a4cfaf064a2956bffe6d414bd47c0 (diff) | |
Merge "Wire Neutron ML2 plugin and OVS agent settings as arrays"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index a4f4578b..1a571120 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -109,7 +109,7 @@ parameters: to create provider networks (and we use this for the default floating network) - if changing this either use different post-install network scripts or be sure to keep 'datacentre' as a mapping network name. - type: string + type: comma_delimited_list default: "datacentre:br-ex" NeutronControlPlaneID: default: 'ctlplane' @@ -128,15 +128,15 @@ parameters: Enable/disable the L2 population feature in the Neutron agents. default: "False" NeutronFlatNetworks: - type: string + type: comma_delimited_list default: 'datacentre' description: > If set, flat networks to configure in neutron plugins. Defaults to 'datacentre' to permit external network creation. NeutronNetworkType: default: 'vxlan' - description: The tenant network type for Neutron, either gre or vxlan. - type: string + description: The tenant network type for Neutron. + type: comma_delimited_list NeutronPassword: default: unset description: The password for the neutron service account, used by neutron agents. @@ -176,9 +176,8 @@ parameters: NeutronTunnelTypes: default: 'vxlan' description: | - The tunnel types for the Neutron tenant network. To specify multiple - values, use a comma separated string, like so: 'gre,vxlan' - type: string + The tunnel types for the Neutron tenant network. + type: comma_delimited_list NeutronTunnelIdRanges: description: | Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges @@ -211,9 +210,8 @@ parameters: NeutronMechanismDrivers: default: 'openvswitch' description: | - The mechanism drivers for the Neutron tenant network. To specify multiple - values, use a comma separated string, like so: 'openvswitch,l2_population' - type: string + The mechanism drivers for the Neutron tenant network. + type: comma_delimited_list NeutronAllowL3AgentFailover: default: 'False' description: Allow automatic l3-agent failover |