From 47568e1c163bfe856b1502445008cd1395c77f0e Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Wed, 23 Jul 2014 15:30:26 -0400
Subject: [PATCH] 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
---
 swift-source.yaml         | 4 ++--
 swift-storage-source.yaml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/swift-source.yaml b/swift-source.yaml
index a0336872f5..9c7b04f5e5 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 d6539663f1..134e14960d 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: