diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-07 20:31:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-07 20:31:32 +0000 |
commit | 36b3d9edf5fecfaa592c52c41b14f3663847214a (patch) | |
tree | 1c830e6af98784204d3e580fab542817573e392f | |
parent | 1a15a519a0b24f1f71754f6369e8afad7d147fe9 (diff) | |
parent | 34c83781f125ab8441668c724a878c1f00d882b6 (diff) |
Merge "Add enable_tunneling to swift storage metadata"
-rw-r--r-- | swift-storage-source.yaml | 4 |
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: |