aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2014-03-27 11:02:41 -0400
committerJames Slagle <jslagle@redhat.com>2014-04-03 12:08:42 -0400
commit34c83781f125ab8441668c724a878c1f00d882b6 (patch)
treea2f4c203e0c81eaa7fb06b422b7567d03640dad1
parentf4a7284641048c64deb83c8e3dabb79c19ed0ad0 (diff)
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
-rw-r--r--swift-storage-source.yaml4
1 files changed, 4 insertions, 0 deletions
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: