Skip to content

Commit 7b79e0b

Browse files
hjensashjensas
committed
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
1 parent 5639bc4 commit 7b79e0b

File tree

3 files changed

+283
-103
lines changed

3 files changed

+283
-103
lines changed

‎hooks/playbooks/control_plane_ironic.yml

+51
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,54 @@
2424
- op: add
2525
path: /spec/ironic/enabled
2626
value: {{ cifmw_services_ironic_enabled | default('false') }}
27+
- op: add
28+
path: /spec/ironic/template/rpcTransport
29+
value: oslo
30+
- op: add
31+
path: /spec/ironic/template/ironicAPI/override
32+
value:
33+
service:
34+
internal:
35+
metadata:
36+
annotations:
37+
metallb.universe.tf/address-pool: internalapi
38+
metallb.universe.tf/allow-shared-ip: internalapi
39+
metallb.universe.tf/loadBalancerIPs: 172.17.0.80
40+
spec:
41+
type: LoadBalancer
42+
- op: add
43+
path: /spec/ironic/template/ironicConductors/0/networkAttachments
44+
value:
45+
- baremetal
46+
- op: add
47+
path: /spec/ironic/template/ironicConductors/0/provisionNetwork
48+
value: baremetal
49+
- op: add
50+
path: /spec/ironic/template/ironicConductors/0/customServiceConfig
51+
value: |
52+
[neutron]
53+
cleaning_network = provisioning
54+
provisioning_network = provisioning
55+
rescuing_network = provisioning
56+
- op: add
57+
path: /spec/ironic/template/ironicInspector/networkAttachments
58+
value:
59+
- baremetal
60+
- op: add
61+
path: /spec/ovn/template/ovnController/nicMappings
62+
value:
63+
baremetal: baremetal
64+
- op: add
65+
path: /spec/nova/cellTemplates
66+
value:
67+
cell0:
68+
cellDatabaseUser: nova_cell0
69+
hasAPIAccess: true
70+
cell1:
71+
cellDatabaseUser: nova_cell1
72+
cellDatabaseInstance: openstack-cell1
73+
cellMessageBusInstance: rabbitmq-cell1
74+
hasAPIAccess: true
75+
novaComputeTemplates:
76+
compute-ironic:
77+
computeDriver: ironic.IronicDriver

‎zuul.d/edpm_multinode.yaml

+128
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,124 @@
455455
cifmw_config_nmstate: true
456456
cifmw_config_multus: true
457457
cifmw_ci_nmstate_instance_config:
458+
crc:
459+
interfaces:
460+
- name: ospbr
461+
description: Configuring Bridge ospbr with interface ens8
462+
type: linux-bridge
463+
mtu: 1500
464+
bridge:
465+
options:
466+
stp:
467+
enabled: false
468+
port:
469+
- name: ens8
470+
vlan: {}
471+
ipv4:
472+
address:
473+
- ip: 192.168.122.10
474+
prefix-length: 24
475+
enabled: true
476+
ipv6:
477+
enabled: false
478+
- description: storagemgmt vlan interface
479+
name: ens8.23
480+
type: vlan
481+
vlan:
482+
base-iface: ens8
483+
id: 23
484+
reorder-headers: true
485+
ipv4:
486+
address:
487+
- ip: 172.20.0.5
488+
prefix-length: 24
489+
dhcp: false
490+
enabled: true
491+
ipv6:
492+
enabled: false
493+
- description: tenant vlan interface
494+
name: ens8.22
495+
type: vlan
496+
vlan:
497+
base-iface: ens8
498+
id: 22
499+
reorder-headers: true
500+
ipv4:
501+
address:
502+
- ip: 172.19.0.5
503+
prefix-length: 24
504+
dhcp: false
505+
enabled: true
506+
ipv6:
507+
enabled: false
508+
- description: storage vlan interface
509+
name: ens8.21
510+
type: vlan
511+
vlan:
512+
base-iface: ens8
513+
id: 21
514+
reorder-headers: true
515+
ipv4:
516+
address:
517+
- ip: 172.18.0.5
518+
prefix-length: 24
519+
dhcp: false
520+
enabled: true
521+
ipv6:
522+
enabled: false
523+
- description: internalapi vlan interface
524+
name: ens8.20
525+
type: vlan
526+
vlan:
527+
base-iface: ens8
528+
id: 20
529+
reorder-headers: true
530+
ipv4:
531+
address:
532+
- ip: 172.17.0.5
533+
prefix-length: 24
534+
dhcp: false
535+
enabled: true
536+
ipv6:
537+
enabled: false
538+
- description: baremetal bridge
539+
name: baremetal
540+
mtu: 1500
541+
type: linux-bridge
542+
bridge:
543+
options:
544+
stp:
545+
enabled: false
546+
port:
547+
- name: ens7
548+
ipv4:
549+
address:
550+
- ip: 172.20.1.5
551+
prefix-length: "24"
552+
enabled: true
553+
ipv6:
554+
enabled: false
555+
- description: Baremetal VRF
556+
name: baremetalvrf
557+
state: up
558+
type: vrf
559+
vrf:
560+
port:
561+
- baremetal
562+
route-table-id: 10
563+
route-rules:
564+
config: []
565+
routes:
566+
config:
567+
- destination: 0.0.0.0/0
568+
metric: 150
569+
next-hop-address: 172.20.1.1
570+
next-hop-interface: baremetal
571+
table-id: 10
572+
#- destination: 172.20.1.0/24
573+
# metric: 150
574+
# next-hop-address: 192.168.122.1
575+
# next-hop-interface: ospbr
458576
controller:
459577
interfaces:
460578
- name: "{{ cifmw_networking_env_definition.instances['controller'].networks['baremetal'].interface_name | default(omit) }}"
@@ -481,10 +599,12 @@
481599
enabled: false
482600
cifmw_install_yamls_vars_patch_01_ironic_ci_base:
483601
INSTALL_NMSTATE: false
602+
INSTALL_NNCP: false
484603
cifmw_networking_mapper_definition_patch_02_bmaas_net:
485604
networks:
486605
baremetal:
487606
network: "172.20.1.0/24"
607+
gateway: "172.20.1.1"
488608
mtu: 1500
489609
tools:
490610
multus:
@@ -500,6 +620,12 @@
500620
networks:
501621
baremetal:
502622
ip: "172.20.1.5"
623+
cifmw_networking_mapper_definition_patch_03_router:
624+
routers:
625+
ci-router:
626+
networks:
627+
- default
628+
- baremetal
503629
cifmw_libvirt_manager_configuration:
504630
vms:
505631
compute:
@@ -519,5 +645,7 @@
519645
<forward mode='bridge' />
520646
<bridge name='baremetal' />
521647
</network>
648+
cifmw_extras:
649+
- '@scenarios/centos-9/ironic.yml'
522650
run:
523651
- ci/playbooks/edpm/run.yml

0 commit comments

Comments
 (0)