Skip to content

Commit 7250364

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
1 parent e176741 commit 7250364

File tree

4 files changed

+284
-105
lines changed

4 files changed

+284
-105
lines changed

‎galaxy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace: cifmw
88
name: general
99

1010
# The version of the collection. Must be compatible with semantic versioning
11-
version: 1.0.0
11+
version: 1.0.0+35ec3798
1212

1313
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
1414
readme: README.md
@@ -71,7 +71,7 @@ tags:
7171
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
7272
# range specifiers can be set and are separated by ','
7373
dependencies:
74-
'git+https://github.com/containers/ansible-podman-collections': 'master'
74+
'git+https://github.com/containers/ansible-podman-collections': 'main'
7575
'git+https://github.com/ansible-collections/community.general': 'main'
7676
'git+https://github.com/ansible-collections/ansible.posix': 'main'
7777
'git+https://github.com/ansible-collections/ansible.utils': 'main'

‎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

+127
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,124 @@
448448
cifmw_config_nmstate: true
449449
cifmw_config_multus: true
450450
cifmw_ci_nmstate_instance_config:
451+
crc:
452+
interfaces:
453+
#- name: ospbr
454+
# description: Configuring Bridge ospbr with interface ens8
455+
# type: linux-bridge
456+
# mtu: 1500
457+
# bridge:
458+
# options:
459+
# stp:
460+
# enabled: false
461+
# port:
462+
# - name: ens8
463+
# vlan: {}
464+
# ipv4:
465+
# address:
466+
# - ip: 192.168.122.10
467+
# prefix-length: 24
468+
# enabled: true
469+
# ipv6:
470+
# enabled: false
471+
#- description: storagemgmt vlan interface
472+
# name: ens8.23
473+
# type: vlan
474+
# vlan:
475+
# base-iface: ens8
476+
# id: 23
477+
# reorder-headers: true
478+
# ipv4:
479+
# address:
480+
# - ip: 172.20.0.5
481+
# prefix-length: 24
482+
# dhcp: false
483+
# enabled: true
484+
# ipv6:
485+
# enabled: false
486+
#- description: tenant vlan interface
487+
# name: ens8.22
488+
# type: vlan
489+
# vlan:
490+
# base-iface: ens8
491+
# id: 22
492+
# reorder-headers: true
493+
# ipv4:
494+
# address:
495+
# - ip: 172.19.0.5
496+
# prefix-length: 24
497+
# dhcp: false
498+
# enabled: true
499+
# ipv6:
500+
# enabled: false
501+
#- description: storage vlan interface
502+
# name: ens8.21
503+
# type: vlan
504+
# vlan:
505+
# base-iface: ens8
506+
# id: 21
507+
# reorder-headers: true
508+
# ipv4:
509+
# address:
510+
# - ip: 172.18.0.5
511+
# prefix-length: 24
512+
# dhcp: false
513+
# enabled: true
514+
# ipv6:
515+
# enabled: false
516+
#- description: internalapi vlan interface
517+
# name: ens8.20
518+
# type: vlan
519+
# vlan:
520+
# base-iface: ens8
521+
# id: 20
522+
# reorder-headers: true
523+
# ipv4:
524+
# address:
525+
# - ip: 172.17.0.5
526+
# prefix-length: 24
527+
# dhcp: false
528+
# enabled: true
529+
# ipv6:
530+
# enabled: false
531+
- description: baremetal bridge
532+
name: baremetal
533+
mtu: 1500
534+
type: linux-bridge
535+
bridge:
536+
options:
537+
stp:
538+
enabled: false
539+
port:
540+
- name: ens7
541+
ipv4:
542+
address:
543+
- ip: 172.20.1.5
544+
prefix-length: "24"
545+
enabled: true
546+
ipv6:
547+
enabled: false
548+
- description: Baremetal VRF
549+
name: baremetalvrf
550+
state: up
551+
type: vrf
552+
vrf:
553+
port:
554+
- baremetal
555+
route-table-id: 10
556+
route-rules:
557+
config: []
558+
routes:
559+
config:
560+
- destination: 0.0.0.0/0
561+
metric: 150
562+
next-hop-address: 172.20.1.1
563+
next-hop-interface: baremetal
564+
table-id: 10
565+
#- destination: 172.20.1.0/24
566+
# metric: 150
567+
# next-hop-address: 192.168.122.1
568+
# next-hop-interface: ospbr
451569
controller:
452570
interfaces:
453571
- name: "{{ cifmw_networking_env_definition.instances['controller'].networks['baremetal'].interface_name | default(omit) }}"
@@ -478,6 +596,7 @@
478596
networks:
479597
baremetal:
480598
network: "172.20.1.0/24"
599+
gateway: "172.20.1.1"
481600
mtu: 1500
482601
tools:
483602
multus:
@@ -493,6 +612,12 @@
493612
networks:
494613
baremetal:
495614
ip: "172.20.1.5"
615+
cifmw_networking_mapper_definition_patch_03_router:
616+
routers:
617+
ci-router:
618+
networks:
619+
- default
620+
- baremetal
496621
cifmw_libvirt_manager_configuration:
497622
vms:
498623
compute:
@@ -512,5 +637,7 @@
512637
<forward mode='bridge' />
513638
<bridge name='baremetal' />
514639
</network>
640+
cifmw_extras:
641+
- '@scenarios/centos-9/ironic.yml'
515642
run:
516643
- ci/playbooks/edpm/run.yml

0 commit comments

Comments
 (0)