From 3c0755ec1b8219f969c89515fdca910b3cc77619 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 25 Sep 2017 17:10:52 -0500
Subject: [PATCH] Gate: Fix armada neutron deployment

This PS updates the armada neutron deployment to reflect the removal
of the hacked oslo-genconfig tool.

Change-Id: Id3dbe1775a57a5833fd500d8ab6236d4792f8784
---
 .../armada/openstack-master-aio.yaml          | 35 +++++--------------
 tools/deployment/armada/openstack-master.yaml | 35 +++++--------------
 2 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/tools/deployment/armada/openstack-master-aio.yaml b/tools/deployment/armada/openstack-master-aio.yaml
index 321aee86c8..e5344d2c7b 100644
--- a/tools/deployment/armada/openstack-master-aio.yaml
+++ b/tools/deployment/armada/openstack-master-aio.yaml
@@ -574,37 +574,20 @@ data:
         tunnel: docker0
     conf:
       neutron:
-        default:
-          oslo:
-            log:
-              debug: false
-          neutron:
-            db:
-              l3_ha: False
-              min_l3_agents_per_router: 1
-              max_l3_agents_per_router: 1
-              l3_ha_network_type: vxlan
-              dhcp_agents_per_network: 1
+        DEFAULT:
+          l3_ha: False
+          min_l3_agents_per_router: 1
+          max_l3_agents_per_router: 1
+          l3_ha_network_type: vxlan
+          dhcp_agents_per_network: 1
       ml2_conf:
         ml2_type_flat:
-          neutron:
-            ml2:
-              flat_networks: public
+          flat_networks: public
       openvswitch_agent:
         agent:
-          neutron:
-            ml2:
-              ovs:
-                agent:
-                  tunnel_types: vxlan
+          tunnel_types: vxlan
         ovs:
-          neutron:
-            ml2:
-              ovs:
-                agent:
-                  of_interface: ovs-ofctl
-                  ovsdb_interface: vsctl
-                  bridge_mappings: public:br-ex
+          bridge_mappings: public:br-ex
   source:
     type: local
     location: /opt/openstack-helm/charts
diff --git a/tools/deployment/armada/openstack-master.yaml b/tools/deployment/armada/openstack-master.yaml
index 776c7d4473..a8f898f884 100644
--- a/tools/deployment/armada/openstack-master.yaml
+++ b/tools/deployment/armada/openstack-master.yaml
@@ -553,37 +553,20 @@ data:
         tunnel: docker0
     conf:
       neutron:
-        default:
-          oslo:
-            log:
-              debug: false
-          neutron:
-            db:
-              l3_ha: False
-              min_l3_agents_per_router: 1
-              max_l3_agents_per_router: 1
-              l3_ha_network_type: vxlan
-              dhcp_agents_per_network: 1
+        DEFAULT:
+          l3_ha: False
+          min_l3_agents_per_router: 1
+          max_l3_agents_per_router: 1
+          l3_ha_network_type: vxlan
+          dhcp_agents_per_network: 1
       ml2_conf:
         ml2_type_flat:
-          neutron:
-            ml2:
-              flat_networks: public
+          flat_networks: public
       openvswitch_agent:
         agent:
-          neutron:
-            ml2:
-              ovs:
-                agent:
-                  tunnel_types: vxlan
+          tunnel_types: vxlan
         ovs:
-          neutron:
-            ml2:
-              ovs:
-                agent:
-                  of_interface: ovs-ofctl
-                  ovsdb_interface: vsctl
-                  bridge_mappings: public:br-ex
+          bridge_mappings: public:br-ex
   source:
     type: local
     location: /opt/openstack-helm/charts