summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-04 12:20:42 +0000
committerGerrit Code Review <review@openstack.org>2015-06-04 12:20:42 +0000
commit61cbdb12f9d679361d3a8742fb58aae7e2a8cd91 (patch)
treed0bd392c3240098945f5e35a4de09dd4c61d7419
parente57bf3217a3f946b5651b793c243d3f7bb8c2ed6 (diff)
parent14cade765793d401e29f726e5609720ae121eaae (diff)
Merge "Pass NeutronEnableTunnelling to controllers"
-rw-r--r--overcloud-without-mergepy.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 7c2c3a21..3094da79 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -602,6 +602,7 @@ resources:
NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP}
NeutronFlatNetworks: {get_param: NeutronFlatNetworks}
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
+ NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges}
NeutronPublicInterface: {get_param: NeutronPublicInterface}
NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute}