diff options
| -rw-r--r-- | swift-source.yaml | 5 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/swift-source.yaml b/swift-source.yaml index 9c7b04f5..b9f7fbfc 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -11,8 +11,3 @@ resources: proxy-memcache: { get_input: swift_proxy_memcache } replicas: 1 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 3dbdda95..fdf3d980 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -8,12 +8,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 @@ -43,9 +37,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: |