openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Move config options under neutron.ovs"

Browse Source
This commit is contained in:
Jenkins 2014-08-08 08:12:49 +00:00 committed by Gerrit Code Review
commit 9d06cc048d
2 changed files with 4 additions and 2 deletions

4
swift-source.yaml

@ -12,7 +12,7 @@ resources:
replicas: 1
service-password: { get_input: swift_password }
neutron:
enable_tunnelling: {get_param: NeutronEnableTunnelling}
tenant_network_type: {get_param: NeutronNetworkType}
ovs:
local_ip: { get_input: neutron_local_ip }
enable_tunnelling: { get_input: neutron_enable_tunnelling}
tenant_network_type: { get_input: neutron_tenant_network_type}

2
swift-storage-source.yaml

@ -44,6 +44,8 @@ resources:
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: