summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-01 14:31:33 +0000
committerGerrit Code Review <review@openstack.org>2014-09-01 14:31:33 +0000
commit2d6e729c594a3ba17f13c6a7d056e12759530576 (patch)
tree25b5c3bce9ee217e3742d4ef62b23296f59c6cce
parentec7abd73d7debdc887ed552c676db21450d81d81 (diff)
parent11e8ac8f751131b24918229d91c2253503b5452e (diff)
Merge "Remove unused Neutron values"
-rw-r--r--swift-source.yaml5
-rw-r--r--swift-storage-source.yaml9
2 files changed, 0 insertions, 14 deletions
diff --git a/swift-source.yaml b/swift-source.yaml
index 1a5a04f4..cf1cf9dc 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -11,8 +11,3 @@ resources:
proxy-memcache: { get_input: swift_proxy_memcache }
replicas: {get_input: swift_replicas }
service-password: { get_input: swift_password }
- neutron:
- ovs:
- local_ip: { get_input: neutron_local_ip }
- enable_tunnelling: { get_input: neutron_enable_tunnelling}
- tenant_network_type: { get_input: neutron_tenant_network_type}
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 40e0573b..103a7ec7 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -12,12 +12,6 @@ parameters:
default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
type: string
- NeutronNetworkType:
- type: string
- default: 'gre'
- NeutronEnableTunnelling:
- type: string
- default: True
resources:
SwiftStorage0:
type: OS::Nova::Server
@@ -47,9 +41,6 @@ resources:
config: {get_resource: SwiftConfig}
signal_transport: NO_SIGNAL
input_values:
- neutron_local_ip: {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
- neutron_tenant_network_type: {get_param: NeutronNetworkType}
- neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
swift_hash_suffix: {get_param: SwiftHashSuffix}
swift_password: {get_param: SwiftPassword}
swift_devices: