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 10, 2024
1 parent e176741 commit 7250364
Show file tree
Hide file tree
Showing 4 changed files with 284 additions and 105 deletions.
4 changes: 2 additions & 2 deletions galaxy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace: cifmw
name: general

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

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down Expand Up @@ -71,7 +71,7 @@ tags:
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
# range specifiers can be set and are separated by ','
dependencies:
'git+https://github.com/containers/ansible-podman-collections': 'master'
'git+https://github.com/containers/ansible-podman-collections': 'main'
'git+https://github.com/ansible-collections/community.general': 'main'
'git+https://github.com/ansible-collections/ansible.posix': 'main'
'git+https://github.com/ansible-collections/ansible.utils': 'main'
Expand Down
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
127 changes: 127 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,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) }}"
Expand Down Expand Up @@ -478,6 +596,7 @@
networks:
baremetal:
network: "172.20.1.0/24"
gateway: "172.20.1.1"
mtu: 1500
tools:
multus:
Expand All @@ -493,6 +612,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 +637,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 7250364

Please sign in to comment.