Merge "Neutron: remove oslo-genconfig"

tools/overrides/mvp/neutron-linuxbridge.yaml

@@ -41,44 +41,25 @@ dependencies:
 
 conf:
   neutron:
-    default:
-      oslo:
-        log:
-          debug: false
-      neutron:
-        agent:
-          interface_driver: linuxbridge
-        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
-  ml2_conf:
-    ml2:
-      neutron:
-        ml2:
-          mechanism_drivers: linuxbridge, l2population
-    ml2_type_flat:
-      neutron:
-        ml2:
-          flat_networks: public
+    DEFAULT:
+      interface_driver: linuxbridge
+      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
   dhcp_agent:
-    default:
-      neutron:
-        base:
-          agent:
-            interface_driver: linuxbridge
+    DEFAULT:
+      interface_driver: linuxbridge
   l3_agent:
-    default:
-      neutron:
-        base:
-          agent:
-            interface_driver: linuxbridge
-  linuxbridge_agent:
-    linux_bridge:
-      neutron:
-        ml2:
-          linuxbridge:
-            agent:
-              bridge_mappings: "public:br-ex"
+    DEFAULT:
+      interface_driver: linuxbridge
+  plugins:
+    ml2_conf:
+      ml2:
+        mechanism_drivers: linuxbridge, l2population
+      ml2_type_flat:
+        flat_networks: public
+    linuxbridge_agent:
+      linux_bridge:
+        bridge_mappings: "public:br-ex"

tools/overrides/mvp/neutron-ovs.yaml

@@ -23,32 +23,18 @@ network:
 
 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
-  ml2_conf:
-    ml2_type_flat:
-      neutron:
-        ml2:
-          flat_networks: public
-  openvswitch_agent:
-    agent:
-      neutron:
-        ml2:
-          ovs:
-            agent:
-              tunnel_types: vxlan
-    ovs:
-      neutron:
-        ml2:
-          ovs:
-            agent:
-              bridge_mappings: public:br-ex
+    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
+  plugins:
+    ml2_conf:
+      ml2_type_flat:
+        flat_networks: public
+    openvswitch_agent:
+      agent:
+        tunnel_types: vxlan
+      ovs:
+        bridge_mappings: public:br-ex