openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move config options under neutron.ovs 

These config options are supposed to be under neutron.ovs (see template
for neutron openvswitch agent). They were mistakenly moved to be just
under neutron when the migration to SoftwareConfig was done.

Change-Id: I5769dc1dc501d48c965f8e4e36238cfcaac64a17
This commit is contained in:
James Slagle 2014-07-23 15:30:26 -04:00
parent 02772ba287
commit 47568e1c16
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift-source.yaml
View File

@ -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
View File

@ -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: