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 92e11e6..16f2f36 100644 (file)
--- 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: