Update to working Neutron config

devstack_setup.yml

@@ -4,11 +4,11 @@
   become: true
 
   tasks:
-    - name: Add RDO Antelope repo to dnf
-      ansible.builtin.dnf:
-        name: 'https://www.rdoproject.org/repos/rdo-release.el9.rpm'
-        state: present
-        disable_gpg_check: true
+#    - name: Add RDO Antelope repo to dnf
+#      ansible.builtin.dnf:
+#        name: 'https://www.rdoproject.org/repos/rdo-release.el9.rpm'
+#        state: present
+#        disable_gpg_check: true
 
     - name: Update all packages
       ansible.builtin.package:
@@ -46,11 +46,11 @@
         user: stack
         state: present
 
-    - name: OpenVSwitch Service enabled and started
-      ansible.builtin.service:
-        name: openvswitch
-        state: started
-        enabled: true
+    # - name: OpenVSwitch Service enabled and started
+    #   ansible.builtin.service:
+    #     name: openvswitch
+    #     state: started
+    #     enabled: true
 
 - name: Bootstrap Network configuration
   hosts: all
@@ -103,6 +103,14 @@
     #     group: root
     #     mode: '0600'
 
+    - name: Add /usr/local/bin to bashrc PATH
+      ansible.builtin.lineinfile:
+        path: /etc/bashrc
+        line: PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
+        state: present
+        insertafter: EOF
+        create: true
+
     - name: Clone openstack-ansible repo into /opt/openstack-ansible
       ansible.builtin.git:
         repo: https://opendev.org/openstack/openstack-ansible

files/openstack_user_config.yml

@@ -12,7 +12,7 @@ global_overrides:
   internal_lb_vip_address: 172.29.236.11
   external_lb_vip_address: 172.29.236.10
   management_bridge: "br-mgmt"
-  tunnel_bridge: "br-vxlan"
+  tunnel_bridge: "br-tunnel"
   neutron_provider_networks:
     network_types: "geneve"
     network_geneve_ranges: "1:1000"
@@ -50,25 +50,39 @@ global_overrides:
         container_interface: "eth10"
         container_mtu: "9000"
         ip_from_q: "tunnel"
+        net_name: "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
+          - network_hosts
+          - compute_hosts
+    - network:
+        container_bridge: "br-vlan"
+        container_type: "veth"
+        container_interface: "eth11"
+        container_mtu: "9000"
+        type: "vlan"
+        range: "700:899"
+        net_name: "vlan"
+        host_bind_override: "ens2f1"
+        group_binds:
+          - compute_hosts
+
+    - network:
+        container_bridge: "br-vlan"
+        container_type: "veth"
+        container_interface: "eth11"
+        container_mtu: "9000"
+        type: "vlan"
+        range: "700:899"
+        net_name: "vlan"
+        host_bind_override: "ens3"
+        group_binds:
+          - network_hosts
 
 # Workaround for https://github.com/eventlet/eventlet/issues/781
-venv_default_pip_packages:
-  - eventlet==0.33.3
+# venv_default_pip_packages:
+#   - eventlet==0.33.3
 
 neutron_plugin_type: ml2.ovn
 
@@ -146,11 +160,15 @@ network_hosts:
   infra1:
     ip: 172.29.236.11
 
+network-northd_hosts:
+  infra1:
+    ip: 172.29.236.11
+
 neutron_ovn_northd:
   infra1:
     ip: 172.29.236.11
 
-network_gateway_hosts:
+network-gateway_hosts:
   infra1:
     ip: 172.29.236.11
 

inventory/devstack.yml

@@ -4,8 +4,8 @@ all:
     ansible_user: ptoal
 control:
   hosts:
-    ospc.lab.toal.ca:
+    infra1.osp.toal.ca:
 
 compute:
   hosts:
-    compute1.lab.toal.ca:
+    compute1.osp.toal.ca:

inventory/host_vars/compute1.osp.toal.ca/networking.yml

@@ -3,13 +3,13 @@ network_state:
   dns-resolver:
     config:
       server:
-        - 192.168.90.1
+        - 172.29.236.1
       search: []
   routes:
     config:
       - destination: 0.0.0.0/0
-        next-hop-interface: enp3s0f0
-        next-hop-address: 192.168.90.1
+        next-hop-interface: br-mgmt
+        next-hop-address: 172.29.236.1
         metric: 400
         table-id: 254
   interfaces:
@@ -18,8 +18,8 @@ network_state:
       state: up
       mtu: 9000
       ipv4:
-        enabled: true
-        dhcp: true
+        enabled: false
+        dhcp: false
     - name: ens2f1
       type: ethernet
       state: up
@@ -31,17 +31,6 @@ network_state:
         enabled: false
         dhcp: false
         autoconf: false
-    - name: ens2f1.236
-      type: vlan
-      state: up
-      mtu: 9000
-      ipv4:
-        enabled: false
-        dhcp: false
-      vlan:
-        base-iface: ens2f1
-        id: 236
-        protocol: 802.1q
     - name: ens2f1.240
       type: vlan
       state: up
@@ -69,7 +58,7 @@ network_state:
       state: up
       bridge:
         port:
-          - name: ens2f1.236
+          - name: enp3s0f0
       ipv4:
         enabled: true
         dhcp: false

inventory/host_vars/infra1.osp.toal.ca/networking.yml

@@ -3,32 +3,16 @@ network_state:
   dns-resolver:
     config:
       server:
-        - 192.168.90.1
+        - 172.29.236.1
       search: []
   routes:
     config:
       - destination: 0.0.0.0/0
-        next-hop-interface: ens4
-        next-hop-address: 192.168.90.1
+        next-hop-interface: br-mgmt
+        next-hop-address: 172.29.236.1
         metric: 400
         table-id: 254
   interfaces:
-    - name: ens4
-      type: ethernet
-      state: up
-      mtu: 1500
-      ipv4:
-        enabled: true
-        dhcp: false
-        address:
-          - ip: 192.168.90.21
-            prefix-length: 24
-      ipv6:
-        enabled: true
-        dhcp: false
-        autoconf: false
-      # lldp:
-      #   enabled: true
     - name: ens3
       type: ethernet
       state: up
@@ -42,17 +26,6 @@ network_state:
         autoconf: false
       # lldp:
       #   enabled: true
-    - name: ens3.236
-      type: vlan
-      state: up
-      mtu: 9000
-      ipv4:
-        enabled: false
-        dhcp: false
-      vlan:
-        base-iface: ens3
-        id: 236
-        protocol: 802.1q
     - name: ens3.240
       type: vlan
       state: up
@@ -76,7 +49,7 @@ network_state:
       state: up
       bridge:
         port:
-          - name: ens3.236
+          - name: ens4
       ipv4:
         enabled: true
         dhcp: false