From: Jenkins Date: Mon, 1 Sep 2014 14:31:33 +0000 (+0000) Subject: Merge "Remove unused Neutron values" X-Git-Tag: opnfv-6.0.0~2753 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2d6e729c594a3ba17f13c6a7d056e12759530576;p=apex-tripleo-heat-templates.git Merge "Remove unused Neutron values" --- 2d6e729c594a3ba17f13c6a7d056e12759530576 diff --cc swift-source.yaml index 1a5a04f4,b9f7fbfc..cf1cf9dc --- a/swift-source.yaml +++ b/swift-source.yaml @@@ -9,10 -9,5 +9,5 @@@ resources hash: { get_input: swift_hash_suffix } part-power: 10 proxy-memcache: { get_input: swift_proxy_memcache } - replicas: 1 + 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}