fixing controlplane and dataplane stuff

openstack-k8s-operators · Apr 15, 2024 · a8596eb · a8596eb
1 parent 1d8012f
commit a8596eb
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 54 deletions.
diff --git a/dt/bgp/edpm/kustomization.yaml b/dt/bgp/edpm/kustomization.yaml
@@ -20,8 +20,8 @@ transformers:
 components:
   - ../../../lib/dataplane
 
-#resources:
-#  - nova_ceph.yaml
+resources:
+  - nova_custom.yaml
 
 #replacements:
 #  # Control plane custom service configs

diff --git a/dt/bgp/edpm/nova_custom.yaml b/dt/bgp/edpm/nova_custom.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: dataplane.openstack.org/v1beta1
+kind: OpenStackDataPlaneService
+metadata:
+  name: nova-custom
+spec:
+  secrets:
+    - nova-cell1-compute-config
+    - nova-migration-ssh-key
+  playbook: osp.edpm.nova
+  tlsCert:
+    contents:
+      - dnsnames
+      - ips
+    networks:
+      - ctlplane
+    issuer: osp-rootca-issuer-internal
+  caCerts: combined-ca-bundle
diff --git a/examples/dt/bgp/config/control-plane/nncp/values.yaml b/examples/dt/bgp/config/control-plane/nncp/values.yaml
@@ -64,7 +64,7 @@ data:
         name: subnet1
     prefix-length: 24
     iface: enp8s0
-    mtu: 9000
+    mtu: 1500
     lb_addresses:
     - 192.168.122.80-192.168.122.90
     endpoint_annotations:
@@ -126,7 +126,7 @@ data:
         cidr: 172.18.0.0/24
         name: subnet1
         vlan: 21
-    mtu: 9000
+    mtu: 1500
     prefix-length: 24
     iface: storage
     vlan: 21
@@ -146,16 +146,6 @@ data:
           "range_end": "172.18.0.70"
         }
       }
-  storagemgmt:  # used on RHEL, not used on OpenShift
-    dnsDomain: storagemgmt.example.com
-    subnets:
-      - allocationRanges:
-          - end: 172.20.0.250
-            start: 172.20.0.100
-        cidr: 172.20.0.0/24
-        name: subnet1
-        vlan: 23
-    mtu: 9000
   tenant:
     dnsDomain: tenant.example.com
     subnets:

diff --git a/examples/dt/bgp/config/edpm/values.yaml b/examples/dt/bgp/config/edpm/values.yaml
@@ -24,11 +24,11 @@ data:
       ansibleVars:
         edpm_ovn_bgp_agent_expose_tenant_networks: false
         edpm_frr_bgp_ipv4_src_network: bgpmainnet
-        edpm_frr_bgp_ipv6_src_network: bgpmainnet6
+        edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
         edpm_frr_bgp_neighbor_password: f00barZ
         edpm_frr_bgp_uplinks:
-          - nic1
-          - nic2
+          - nic3
+          - nic4
         timesync_ntp_servers:
           - hostname: clock.redhat.com
         # CHANGEME -- see https://access.redhat.com/solutions/253273
@@ -41,11 +41,11 @@ data:
         edpm_network_config_hide_sensitive_logs: false
         edpm_network_config_os_net_config_mappings:
           edpm-compute-0:
-            nic3: 6a:fe:54:3f:8a:02  # CHANGEME
+            nic2: 6a:fe:54:3f:8a:02  # CHANGEME
           edpm-compute-1:
-            nic3: 6b:fe:54:3f:8a:02  # CHANGEME
+            nic2: 6b:fe:54:3f:8a:02  # CHANGEME
           edpm-compute-2:
-            nic3: 6c:fe:54:3f:8a:02  # CHANGEME
+            nic2: 6c:fe:54:3f:8a:02  # CHANGEME
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -54,51 +54,47 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
+          - type: interface
+            name: nic2
             mtu: {{ min_viable_mtu }}
             use_dhcp: false
             dns_servers: {{ ctlplane_dns_nameservers }}
-            domain: {{ dns_search_domains }}
             addresses:
             - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
-            routes: {{ ctlplane_host_routes }}
-            members:
-            - type: interface
-              name: nic3
-              mtu: {{ min_viable_mtu }}
-              # force the MAC address of the bridge to this interface
-              primary: true
-          {% for network in nodeset_networks %}
-            - type: vlan
-              mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
-              vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
-              addresses:
-              - ip_netmask:
-                  {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
-              routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
-          {% endfor %}
+          {% for network in nodeset_networks            %}
+          {%   if not network.lower().startswith('bgp') %}
+          - type: vlan
+            device: nic2
+            mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+            vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+            addresses:
+            - ip_netmask:
+                {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+            routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+          {%   endif                                    %}
+          {% endfor                                     %}
           - type: interface
-            name: nic1
+            name: nic3
             use_dhcp: false
             addresses:
             - ip_netmask: {{ lookup('vars', 'bgpnet0_ip') }}/30
           - type: interface
-            name: nic2
+            name: nic4
             use_dhcp: false
             addresses:
             - ip_netmask: {{ lookup('vars', 'bgpnet1_ip') }}/30
           - type: interface
             name: lo
             addresses:
             - ip_netmask: {{ lookup('vars', 'bgpmainnet_ip') }}/32
-            - ip_netmask: {{ lookup('vars', 'bgpmainnet6_ip') }}/128
+            - ip_netmask: {{ lookup('vars', 'bgpmainnetv6_ip') }}/128
         edpm_neutron_metadata_agent_image: '{{ registry_url }}/openstack-neutron-metadata-agent-ovn:{{ image_tag }}'
         edpm_nodes_validation_validate_controllers_icmp: false
         edpm_nodes_validation_validate_gateway_icmp: false
         edpm_nova_compute_container_image: '{{ registry_url }}/openstack-nova-compute:{{ image_tag }}'
         edpm_nova_libvirt_container_image: '{{ registry_url }}/openstack-nova-libvirt:{{ image_tag }}'
         edpm_ovn_controller_agent_image: '{{ registry_url }}/openstack-ovn-controller:{{ image_tag }}'
+        edpm_frr_image: '{{ registry_url }}/openstack-frr:{{ image_tag }}'
         edpm_selinux_mode: enforcing
         edpm_sshd_allowed_ranges:
           - 192.168.122.0/24
@@ -122,8 +118,30 @@ data:
         subnetName: subnet1
       - name: Tenant
         subnetName: subnet1
-      - name: StorageMgmt
+      - name: BgpNet0
+        subnetName: subnet0
+      - name: BgpNet1
+        subnetName: subnet0
+      - name: BgpMainNet
+        subnetName: subnet0
+      - name: BgpMainNetV6
+        subnetName: subnet0
+      - name: BgpNet0
+        subnetName: subnet1
+      - name: BgpNet1
         subnetName: subnet1
+      - name: BgpMainNet
+        subnetName: subnet1
+      - name: BgpMainNetV6
+        subnetName: subnet1
+      - name: BgpNet0
+        subnetName: subnet2
+      - name: BgpNet1
+        subnetName: subnet2
+      - name: BgpMainNet
+        subnetName: subnet2
+      - name: BgpMainNetV6
+        subnetName: subnet2
     nodes:
       edpm-compute-0:
         ansible:
@@ -145,8 +163,6 @@ data:
             subnetName: subnet1
           - name: Storage
             subnetName: subnet1
-          - name: StorageMgmt
-            subnetName: subnet1
           - name: Tenant
             subnetName: subnet1
           - name: Bgpnet1
@@ -158,7 +174,7 @@ data:
           - name: Bgpmainnet
             subnetName: subnet1
             fixedIP: 172.30.0.2
-          - name: Bgpmainnet6
+          - name: BgpmainnetV6
             subnetName: subnet1
             fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:0012
       edpm-compute-1:
@@ -181,8 +197,6 @@ data:
             subnetName: subnet1
           - name: Storage
             subnetName: subnet1
-          - name: StorageMgmt
-            subnetName: subnet1
           - name: Tenant
             subnetName: subnet1
           - name: Bgpnet1
@@ -194,9 +208,9 @@ data:
           - name: Bgpmainnet
             subnetName: subnet1
             fixedIP: 172.30.1.2
-          - name: Bgpmainnet6
+          - name: BgpmainnetV6
             subnetName: subnet1
-            fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:0013
+            fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:0022
       edpm-compute-2:
         ansible:
           ansibleHost: 192.168.122.102
@@ -217,8 +231,6 @@ data:
             subnetName: subnet1
           - name: Storage
             subnetName: subnet1
-          - name: StorageMgmt
-            subnetName: subnet1
           - name: Tenant
             subnetName: subnet1
           - name: Bgpnet1
@@ -230,17 +242,25 @@ data:
           - name: Bgpmainnet
             subnetName: subnet1
             fixedIP: 172.30.2.2
-          - name: Bgpmainnet6
+          - name: BgpmainnetV6
             subnetName: subnet1
-            fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:0014
+            fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:0034
     services:
+      - download-cache
       - bootstrap
       - configure-network
       - validate-network
+      - frr
       - install-os
       - configure-os
       - run-os
       - reboot-os
+      - install-certs
+      - ovn
+      - neutron-metadata
+      - ovn-bgp-agent
+      - libvirt
+      - nova-custom
   nova:
     migration:
       ssh_keys: