openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unused Neutron values"

Browse Source
This commit is contained in:
Jenkins 2014-09-01 14:31:33 +00:00 committed by Gerrit Code Review
commit 2d6e729c59
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swift-source.yaml
View File

@ -11,8 +11,3 @@ resources:
proxy-memcache: { get_input: swift_proxy_memcache } proxy-memcache: { get_input: swift_proxy_memcache }
replicas: {get_input: swift_replicas } replicas: {get_input: swift_replicas }
service-password: { get_input: swift_password } 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}

9
swift-storage-source.yaml
View File

@ -12,12 +12,6 @@ parameters:
default: baremetal default: baremetal
description: Flavor for Swift storage nodes to request when deploying. description: Flavor for Swift storage nodes to request when deploying.
type: string type: string
NeutronNetworkType:
type: string
default: 'gre'
NeutronEnableTunnelling:
type: string
default: True
resources: resources:
SwiftStorage0: SwiftStorage0:
type: OS::Nova::Server type: OS::Nova::Server
@ -47,9 +41,6 @@ resources:
config: {get_resource: SwiftConfig} config: {get_resource: SwiftConfig}
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
input_values: 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_hash_suffix: {get_param: SwiftHashSuffix}
swift_password: {get_param: SwiftPassword} swift_password: {get_param: SwiftPassword}
swift_devices: swift_devices: