aboutsummaryrefslogtreecommitdiffstats
path: root/nova-compute-config.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-15 19:18:08 +0000
committerGerrit Code Review <review@openstack.org>2014-09-15 19:18:08 +0000
commit4608c70e12734fa289463264d47f9a650c326dd4 (patch)
tree969b18afc6bed81c6fda52db61137b7a48cad060 /nova-compute-config.yaml
parentd6e40a3fffb37d476990cf4de4413057b5a9ef90 (diff)
parenteb7fe9bb9bb1298e5e2daed43622b57033c76c34 (diff)
Merge "Parameterize network type and tunnel types"
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}