diff options
| author |   James Slagle <jslagle@redhat.com> | 2014-08-04 20:04:18 -0400 |
|---|---|---|
| committer | James Slagle <jslagle@redhat.com> | 2014-09-15 08:16:48 -0400 |
| commit | eb7fe9bb9bb1298e5e2daed43622b57033c76c34 (patch) | |
| tree | 38015c453d84f329286fbe39d5348914d6aca586 /overcloud-source.yaml | |
| parent | fd18617b30a569142636e4a31b9b8975364155c2 (diff) | |
Parameterize network type and tunnel types
Remove the hardcoding of gre as the Neutron tenant network type for the
Overcloud. This will enable the ability to deploy an Overcloud that uses
vxlan instead of gre tunnels. A new parameter, NeutronTunnelTypes, is
added to allow configuring the tunnel_types parameter in the Neutron ML2
configuration.
This change is required by https://review.openstack.org/#/c/92913
Change-Id: I2c2e2153a61349e58ada28c87aa2338c9f00e7bd
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 3dbd5712..6cceff2e 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -235,7 +235,17 @@ parameters: description: Neutron ID for ctlplane network. NeutronDnsmasqOptions: default: 'dhcp-option-force=26,1400' - description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead. + description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the tunnel overhead. + type: string + NeutronNetworkType: + default: 'gre' + description: The tenant network type for Neutron, either gre or vxlan. + type: string + NeutronTunnelTypes: + default: 'gre' + description: | + The tunnel types for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'gre,vxlan' type: string controllerImage: type: string @@ -393,7 +403,10 @@ resources: - - mysql://neutron:unset@ - *compute_database_host - /ovs_neutron - NeutronNetworkType: "gre" + NeutronNetworkType: + get_param: NeutronNetworkType + NeutronTunnelTypes: + get_param: NeutronTunnelTypes NeutronEnableTunnelling: "True" NeutronFlatNetworks: get_param: NeutronFlatNetworks @@ -580,7 +593,10 @@ resources: public_interface_tag: get_param: NeutronPublicInterfaceTag physical_bridge: br-ex - tenant_network_type: gre + tenant_network_type: + get_param: NeutronNetworkType + tunnel_types: + get_param: NeutronTunnelTypes ovs_db: Fn::Join: - '' |