Skip to content

Commit

Permalink
WIP: crc-bootstrap-staging-ironic
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@hjensas
hjensas committed Nov 8, 2024
1 parent e176741 commit 110c443
Show file tree
Hide file tree
Showing 3 changed files with 319 additions and 103 deletions.
51 changes: 51 additions & 0 deletions hooks/playbooks/control_plane_ironic.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,54 @@
- 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
164 changes: 164 additions & 0 deletions zuul.d/edpm_multinode.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,161 @@
cifmw_config_nmstate: true
cifmw_config_multus: true
cifmw_ci_nmstate_instance_config:
crc:
dns-resolver:
config:
search: []
server:
- 192.168.122.1
interfaces:
- name: ospbr
description: Configuring Bridge ospbr with interface enp6s0
bridge:
options:
stp:
enabled: false
port:
- name: enp6s0
vlan: {}
ipv4:
address:
- ip: 192.168.122.10
prefix-length: 24
enabled: true
ipv6:
enabled: false
mtu: 1500
name: ospbr
type: linux-bridge
- description: storagemgmt vlan interface
ipv4:
address:
- ip: 172.20.0.5
prefix-length: 24
dhcp: false
enabled: true
ipv6:
enabled: false
name: enp6s0.23
type: vlan
vlan:
base-iface: enp6s0
id: 23
reorder-headers: true
- description: tenant vlan interface
ipv4:
address:
- ip: 172.19.0.5
prefix-length: 24
dhcp: false
enabled: true
ipv6:
enabled: false
name: enp6s0.22
type: vlan
vlan:
base-iface: enp6s0
id: 22
reorder-headers: true
- description: storage vlan interface
ipv4:
address:
- ip: 172.18.0.5
prefix-length: 24
dhcp: false
enabled: true
ipv6:
enabled: false
name: enp6s0.21
type: vlan
vlan:
base-iface: enp6s0
id: 21
reorder-headers: true
- description: internalapi vlan interface
ipv4:
address:
- ip: 172.17.0.5
prefix-length: 24
dhcp: false
enabled: true
ipv6:
enabled: false
name: enp6s0.20
type: vlan
vlan:
base-iface: enp6s0
id: 20
reorder-headers: true
- description: Octavia vlan host interface
name: enp6s0.24
type: vlan
vlan:
base-iface: enp6s0
id: 24
- description: Configuring bridge octbr
bridge:
options:
stp:
enabled: false
port:
- name: enp6s0.24
mtu: 1500
name: octbr
type: linux-bridge
- description: designate vlan interface
ipv4:
address:
- ip: 172.28.0.5
prefix-length: 24
dhcp: false
enabled: true
ipv6:
enabled: false
name: enp6s0.25
type: vlan
vlan:
base-iface: enp6s0
id: 25
reorder-headers: true
- description: baremetal bridge
bridge:
options:
stp:
enabled: false
port:
- name: enp7s0
ipv4:
address:
- ip: 172.20.1.5
prefix-length: "24"
enabled: true
ipv6:
enabled: false
mtu: 1500
name: baremetal
type: linux-bridge
- 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) }}"
Expand Down Expand Up @@ -478,6 +633,7 @@
networks:
baremetal:
network: "172.20.1.0/24"
gateway: "172.20.1.1"
mtu: 1500
tools:
multus:
Expand All @@ -493,6 +649,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:
Expand All @@ -512,5 +674,7 @@
<forward mode='bridge' />
<bridge name='baremetal' />
</network>
cifmw_extras:
- '@scenarios/centos-9/ironic.yml'
run:
- ci/playbooks/edpm/run.yml
Loading

0 comments on commit 110c443

Please sign in to comment.