Update to use control node on storage as VM

files/openstack_user_config.yml

@@ -13,10 +13,15 @@ global_overrides:
   external_lb_vip_address: 172.29.236.10
   management_bridge: "br-mgmt"
   tunnel_bridge: "br-vxlan"
+  neutron_provider_networks:
+    network_types: "geneve"
+    network_geneve_ranges: "1:1000"
+    network_vlan_ranges: "public"
+    network_mappings: "public:br-publicnet"
+    network_interface_mappings: "br-publicnet:bond1"
   provider_networks:
     - network:
         container_bridge: "br-mgmt"
-        container_bridge_type: openvswitch
         container_type: "veth"
         container_interface: "eth1"
         ip_from_q: "container"
@@ -26,33 +31,8 @@ global_overrides:
           - hosts
         is_management_address: true
         is_container_address: true
-    - network:
-        container_bridge: "br-vxlan"
-        container_bridge_type: openvswitch
-        container_type: "veth"
-        container_interface: "eth10"
-        container_mtu: "9000"
-        ip_from_q: "tunnel"
-        type: "vxlan"
-        range: "1:1000"
-        group_binds:
-          - neutron_openvswitch_agent
-    # - network:
-    #     container_bridge: "br-vlan"
-    #     container_bridge_type: openvswitch
-    #     container_type: "veth"
-    #     container_interface: "eth11"
-    #     container_mtu: "9000"
-    #     type: "vlan"
-    #     range: "701:800,801:900"
-    #     net_name: "vlan"
-    #     group_binds:
-    #       - neutron_openvswitch_agent
-    #     host_bind_override:
-    #       -
     - network:
         container_bridge: "br-storage"
-        container_bridge_type: openvswitch
         container_type: "veth"
         container_interface: "eth2"
         container_mtu: "9000"
@@ -64,13 +44,44 @@ global_overrides:
           - cinder_volume
           - nova_compute
           - repo_container
-          - neutron_openvswitch_agent
+    - network:
+        container_bridge: "br-tunnel"
+        container_type: "veth"
+        container_interface: "eth10"
+        container_mtu: "9000"
+        ip_from_q: "tunnel"
+        type: "geneve"
+        range: "1:1000"
+        group_binds:
+          - neutron_ovn_controller
+    # - network:
+    #     container_bridge: "br-vlan"
+    #     container_type: "veth"
+    #     container_interface: "eth11"
+    #     container_mtu: "9000"
+    #     type: "vlan"
+    #     range: "700:899"
+    #     net_name: "vlan"
+    #     network_interface: "br-ex"
+    #     group_binds:
+    #       - neutron_ovn_controller
 
-neutron_plugin_type: ml2.ovs
+# Workaround for https://github.com/eventlet/eventlet/issues/781
+venv_default_pip_packages:
+  - eventlet==0.33.3
+
+neutron_plugin_type: ml2.ovn
 
-neutron_ml2_drivers_type: "flat,vlan,vxlan"
 neutron_plugin_base:
-  - router
+  - ovn-router
+
+neutron_ml2_drivers_type: "vlan,local,geneve"
+
+# neutron_plugin_type: ml2.ovs
+
+# neutron_ml2_drivers_type: "flat,vlan,vxlan"
+# neutron_plugin_base:
+#   - router
 
 ###
 ### Infrastructure
@@ -135,6 +146,22 @@ network_hosts:
   infra1:
     ip: 172.29.236.11
 
+neutron_ovn_northd:
+  infra1:
+    ip: 172.29.236.11
+
+network_gateway_hosts:
+  infra1:
+    ip: 172.29.236.11
+
+neutron_ovn_controller:
+  infra1:
+    ip: 172.29.236.11
+
+neutron_ovn_gateway:
+  infra1:
+    ip: 172.29.236.11
+
 # nova hypervisors
 compute_hosts:
   compute1: