WIP: crc-bootstrap-staging-ironic

Swtich the scenario to scenarios/centos-9/ironic.yml Update hooks/playbooks/control_plane_ironic.yml to include kustomization patches to configure ironic and Nova Cell with computeDriver: ironic.IronicDriver Depends-On: openstack-k8s-operators/install_yamls#969
openstack-k8s-operators · Dec 11, 2024 · 0ec4c3d · 0ec4c3d
1 parent 5639bc4
commit 0ec4c3d
Show file tree

Hide file tree

Showing 3 changed files with 294 additions and 103 deletions.
diff --git a/hooks/playbooks/control_plane_ironic.yml b/hooks/playbooks/control_plane_ironic.yml
@@ -21,6 +21,66 @@
           - target:
               kind: OpenStackControlPlane
             patch: |-
+              - op: add
+                path: /spec/swift/enabled
+                value: false
+              - op: add
+                path: /spec/barbican/enabled
+                value: false
+              - op: add
+                path: /spec/telemetry/enabled
+                value: false
               - op: add
                 path: /spec/ironic/enabled
                 value: {{ cifmw_services_ironic_enabled | default('false') }}
+              - op: add
+                path: /spec/ironic/template/rpcTransport
+                value: oslo
+              - op: add
+                path: /spec/ironic/template/ironicAPI/override
+                value:
+                  service:
+                    internal:
+                      metadata:
+                        annotations:
+                          metallb.universe.tf/address-pool: internalapi
+                          metallb.universe.tf/allow-shared-ip: internalapi
+                          metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+                      spec:
+                        type: LoadBalancer
+              - op: add
+                path: /spec/ironic/template/ironicConductors/0/networkAttachments
+                value:
+                  - baremetal
+              - op: add
+                path: /spec/ironic/template/ironicConductors/0/provisionNetwork
+                value: baremetal
+              - op: add
+                path: /spec/ironic/template/ironicConductors/0/customServiceConfig
+                value: |
+                  [neutron]
+                  cleaning_network = provisioning
+                  provisioning_network = provisioning
+                  rescuing_network = provisioning
+              - op: add
+                path: /spec/ironic/template/ironicInspector/networkAttachments
+                value:
+                  - baremetal
+              - op: add
+                path: /spec/ovn/template/ovnController/nicMappings
+                value:
+                  baremetal: baremetal
+              - op: add
+                path: /spec/nova/cellTemplates
+                value:
+                  cell0:
+                    cellDatabaseUser: nova_cell0
+                    hasAPIAccess: true
+                  cell1:
+                    cellDatabaseUser: nova_cell1
+                    cellDatabaseInstance: openstack-cell1
+                    cellMessageBusInstance: rabbitmq-cell1
+                    hasAPIAccess: true
+                    novaComputeTemplates:
+                      compute-ironic:
+                        computeDriver: ironic.IronicDriver
diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml
@@ -455,6 +455,124 @@
       cifmw_config_nmstate: true
       cifmw_config_multus: true
       cifmw_ci_nmstate_instance_config:
+        crc:
+          interfaces:
+            - name: ospbr
+              description: Configuring Bridge ospbr with interface ens8
+              type: linux-bridge
+              mtu: 1500
+              bridge:
+                options:
+                  stp:
+                    enabled: false
+                port:
+                  - name: ens8
+                    vlan: {}
+              ipv4:
+                address:
+                  - ip: 192.168.122.10
+                    prefix-length: 24
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: storagemgmt vlan interface
+              name: ens8.23
+              type: vlan
+              vlan:
+                base-iface: ens8
+                id: 23
+                reorder-headers: true
+              ipv4:
+                address:
+                  - ip: 172.20.0.5
+                    prefix-length: 24
+                dhcp: false
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: tenant vlan interface
+              name: ens8.22
+              type: vlan
+              vlan:
+                base-iface: ens8
+                id: 22
+                reorder-headers: true
+              ipv4:
+                address:
+                  - ip: 172.19.0.5
+                    prefix-length: 24
+                dhcp: false
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: storage vlan interface
+              name: ens8.21
+              type: vlan
+              vlan:
+                base-iface: ens8
+                id: 21
+                reorder-headers: true
+              ipv4:
+                address:
+                  - ip: 172.18.0.5
+                    prefix-length: 24
+                dhcp: false
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: internalapi vlan interface
+              name: ens8.20
+              type: vlan
+              vlan:
+                base-iface: ens8
+                id: 20
+                reorder-headers: true
+              ipv4:
+                address:
+                  - ip: 172.17.0.5
+                    prefix-length: 24
+                dhcp: false
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: baremetal bridge
+              name: baremetal
+              mtu: 1500
+              type: linux-bridge
+              bridge:
+                options:
+                  stp:
+                    enabled: false
+                port:
+                  - name: ens7
+              ipv4:
+                address:
+                  - ip: 172.20.1.5
+                    prefix-length: "24"
+                enabled: true
+              ipv6:
+                enabled: false
+            - description: Baremetal VRF
+              name: baremetalvrf
+              state: up
+              type: vrf
+              vrf:
+                port:
+                  - baremetal
+                route-table-id: 10
+          route-rules:
+            config: []
+          routes:
+            config:
+              - destination: 0.0.0.0/0
+                metric: 150
+                next-hop-address: 172.20.1.1
+                next-hop-interface: baremetal
+                table-id: 10
+              - destination: 172.20.1.0/24
+                metric: 150
+                next-hop-address: 192.168.122.1
+                next-hop-interface: ospbr
         controller:
           interfaces:
             - name: "{{ cifmw_networking_env_definition.instances['controller'].networks['baremetal'].interface_name | default(omit) }}"
@@ -481,10 +599,14 @@
                 enabled: false
       cifmw_install_yamls_vars_patch_01_ironic_ci_base:
         INSTALL_NMSTATE: false
+        INSTALL_NNCP: false
+        NNCP_INTERFACE: ens8
+      cifmw_ci_multus_default_nad_type: bridge
       cifmw_networking_mapper_definition_patch_02_bmaas_net:
         networks:
           baremetal:
             network: "172.20.1.0/24"
+            gateway: "172.20.1.1"
             mtu: 1500
             tools:
               multus:
@@ -500,6 +622,12 @@
             networks:
               baremetal:
                 ip: "172.20.1.5"
+      cifmw_networking_mapper_definition_patch_03_router:
+        routers:
+          ci-router:
+            networks:
+              - default
+              - baremetal
       cifmw_libvirt_manager_configuration:
         vms:
           compute:
@@ -519,5 +647,7 @@
               <forward mode='bridge' />
               <bridge name='baremetal' />
             </network>
+      cifmw_extras:
+        - '@scenarios/centos-9/ironic.yml'
     run:
       - ci/playbooks/edpm/run.yml