diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-08 08:12:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-08 08:12:49 +0000 |
| commit | 9d06cc048d3a26ba61e8e06619e8ab89cdb14fc5 (patch) | |
| tree | 5202eafb1eb2fe7388413f4efb2ca26d0cefcd77 | |
| parent | ecb5ecbca2408e4f97cadb013ff84045815c6327 (diff) | |
| parent | 47568e1c163bfe856b1502445008cd1395c77f0e (diff) | |
Merge "Move config options under neutron.ovs"
| -rw-r--r-- | swift-source.yaml | 4 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/swift-source.yaml b/swift-source.yaml index a0336872..9c7b04f5 100644 --- a/swift-source.yaml +++ b/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} diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index d6539663..134e1496 100644 --- a/swift-storage-source.yaml +++ b/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: |