From: James Slagle <jslagle@redhat.com>
Date: Thu, 27 Mar 2014 15:02:41 +0000 (-0400)
Subject: Add enable_tunneling to swift storage metadata
X-Git-Tag: opnfv-6.0.0~2849^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=34c83781f125ab8441668c724a878c1f00d882b6;p=apex-tripleo-heat-templates.git

Add enable_tunneling to swift storage metadata

Add the enable_tunneling option to the neutron-openvswitch-agent
metadata for the swift storage template. If not preset, this option is
left blank in the openvswitch plugin configuration plugin. This causes
the service to fail to start because a blank value is not permissible
for a boolean option.

Change-Id: Ieadcdab295913121bd00dbd25e4245024bc2240f
---

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 92e11e61..16f2f36c 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -11,6 +11,9 @@ Parameters:
   NeutronNetworkType:
     Type: String
     Default: 'gre'
+  NeutronEnableTunnelling:
+    Type: String
+    Default: True
 Resources:
   SwiftStorageAccessPolicy:
     Type: OS::Heat::AccessPolicy
@@ -81,6 +84,7 @@ Resources:
                   - SwiftStorage0
                   - networks
           tenant_network_type: {Ref: NeutronNetworkType}
+          enable_tunneling: {Ref: NeutronEnableTunnelling}
         service-password:
           Ref: NeutronPassword
       swift: