summaryrefslogtreecommitdiffstats
path: root/nova-compute-config.yaml
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2014-08-04 20:04:18 -0400
committerJames Slagle <jslagle@redhat.com>2014-09-15 08:16:48 -0400
commiteb7fe9bb9bb1298e5e2daed43622b57033c76c34 (patch)
tree38015c453d84f329286fbe39d5348914d6aca586 /nova-compute-config.yaml
parentfd18617b30a569142636e4a31b9b8975364155c2 (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 'nova-compute-config.yaml')
-rw-r--r--nova-compute-config.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 5dc8f204..48cb81ee 100644
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -38,6 +38,7 @@ resources:
ovs:
local_ip: {get_input: neutron_local_ip}
tenant_network_type: {get_input: neutron_tenant_network_type}
+ tunnel_types: {get_input: neutron_tunnel_types}
network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
bridge_mappings: {get_input: neutron_bridge_mappings}
enable_tunneling: {get_input: neutron_enable_tunneling}