diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-09-15 19:18:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-09-15 19:18:08 +0000 |
| commit | 4608c70e12734fa289463264d47f9a650c326dd4 (patch) | |
| tree | 969b18afc6bed81c6fda52db61137b7a48cad060 /overcloud-source.yaml | |
| parent | d6e40a3fffb37d476990cf4de4413057b5a9ef90 (diff) | |
| parent | eb7fe9bb9bb1298e5e2daed43622b57033c76c34 (diff) | |
Merge "Parameterize network type and tunnel types"
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 a9f39860..947becfb 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 @@ -578,7 +591,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: - '' |