Merge "Remove unused Neutron values"

diff --cc swift-source.yaml
index 1a5a04f,b9f7fbf..cf1cf9d
--- 1/swift-source.yaml
--- 2/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}

diff --cc swift-storage-source.yaml
Simple merge