Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add the Ironic baremetal net in a dedicated ci-bootstrap job #2371

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+60 −65
Open

Add the Ironic baremetal net in a dedicated ci-bootstrap job #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/playbooks/bootstrap-networking-mapper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
-e @scenarios/centos-9/base.yml
-e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.yml
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"
-e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.yml
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(blocking) Unsure if necessary but I see this duplicated.

{% if nodepool is defined %}
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/nodepool_params.yml"
{% endif %}
2 changes: 1 addition & 1 deletion zuul.d/base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
parent: base-extracted-crc-ci-bootstrap-staging
timeout: 10800
attempts: 1
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl-vexxhost
irrelevant-files: *ir_files
required-projects: *multinode_edpm_rp
roles: *multinode_edpm_roles
Expand Down
105 changes: 41 additions & 64 deletions zuul.d/edpm_multinode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,64 +367,6 @@
# TODO: to be removed after removing its dependency in ci-bootstrap
crc_ci_bootstrap_networking: {}
vars: &edpm_bootstrap_vars
cifmw_networking_definition:
networks:
default:
network: "192.168.122.0/24"
gateway: "192.168.122.1"
mtu: 1500
internal-api:
network: "172.17.0.0/24"
gateway: "172.17.0.1"
vlan: 20
storage:
network: "172.18.0.0/24"
gateway: "172.18.0.1"
vlan: 21
tenant:
network: "172.19.0.0/24"
gateway: "172.19.0.1"
vlan: 22
instances:
controller:
networks:
default:
ip: "192.168.122.11"
crc:
networks:
default:
ip: "192.168.122.10"
internal-api:
ip: "172.17.0.5"
storage:
ip: "172.18.0.5"
tenant:
ip: "172.19.0.5"
compute-0:
skip-nm-configuration: true
networks:
default:
ip: "192.168.122.100"
internal-api:
ip: "172.17.0.100"
trunk_parent: default
storage:
ip: "172.18.0.100"
trunk_parent: default
tenant:
ip: "172.19.0.100"
trunk_parent: default
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
run:
- ci/playbooks/edpm/run.yml

# Job with ci-bootstrap staging branch job - to be used to test ci-bootstrap
- job:
name: podified-multinode-edpm-deployment-crc-bootstrap-staging
parent: cifmw-podified-multinode-edpm-ci-bootstrap-staging
extra-vars: *edpm_bootstrap_extra_vars
vars:
cifmw_networking_definition:
networks:
default:
Expand Down Expand Up @@ -457,13 +399,13 @@
networks:
default: {}
internal-api:
trunk_parent: default
trunk-parent: default
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(non-blocking) question: Was this a typo?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it was a typo or not but it was a mistake, we have trunk-parent being used by our net_map module[1] and trunk_parent being used by ci-bootstrap role[2]. I assume the confusion originated from there.

[1] https://github.com/search?q=repo%3Aopenstack-k8s-operators%2Fci-framework+trunk-parent+path%3A%2F%5Etests%5C%2Funit%5C%2Fmodule_utils%5C%2F%2F&type=code
[2] https://github.com/search?q=repo%3Aopenstack-k8s-operators%2Fci-bootstrap%20trunk_parent&type=code

skip-nm-configuration: true
tenant:
trunk_parent: default
trunk-parent: default
skip-nm-configuration: true
storage:
trunk_parent: default
trunk-parent: default
skip-nm-configuration: true
instances:
Copy link
Contributor

@frenzyfriday frenzyfriday Oct 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesnt need the compute-0 anymore - it will get the compute info from the group-templates?

By compute-0 I mean:

            skip-nm-configuration: true
            networks:
              default:
                ip: "192.168.122.100"
              internal-api:
                ip: "172.17.0.100"
                trunk_parent: default
              storage:
                ip: "172.18.0.100"
                trunk_parent: default
              tenant:
                ip: "172.19.0.100"
                trunk_parent: default```

controller:
Expand All @@ -476,14 +418,49 @@
ip: "192.168.122.10"
internal-api:
ip: "172.17.0.5"
trunk_parent: default
trunk-parent: default
storage:
ip: "172.18.0.5"
trunk_parent: default
trunk-parent: default
tenant:
ip: "172.19.0.5"
trunk_parent: default
trunk-parent: default
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
run:
- ci/playbooks/edpm/run.yml

# Job with ci-bootstrap staging branch job - to be used to test ci-bootstrap
- job:
name: podified-multinode-edpm-deployment-crc-bootstrap-staging
parent: cifmw-podified-multinode-edpm-ci-bootstrap-staging
extra-vars: *edpm_bootstrap_extra_vars
vars: *edpm_bootstrap_vars
run:
- ci/playbooks/edpm/run.yml

# TODO: Testing Ironic jobs definition
- job:
name: podified-multinode-edpm-deployment-crc-bootstrap-staging-ironic
parent: podified-multinode-edpm-deployment-crc-bootstrap-staging
vars:
cifmw_networking_mapper_definition_patch_02_bmaas_net:
networks:
baremetal:
network: "172.20.1.0/24"
gateway: "172.20.1.1"
mtu: 1500
instances:
controller:
networks:
baremetal:
ip: "172.20.1.11"
skip-nm-configuration: true
crc:
networks:
baremetal:
ip: "172.20.1.5"
skip-nm-configuration: true
run:
- ci/playbooks/edpm/run.yml
- ci/playbooks/edpm/fail.yml
17 changes: 17 additions & 0 deletions zuul.d/nodeset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,23 @@
- name: ocps
nodes:
- crc
# todo: Remove. Temporal. Needed as the credentials used in ci-bootstrap jobs for IBM don't work
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(non-blocking) question: Do we expect to eventually roll back to IBM? I like the idea of the parent change so rolling that back it's just creating another child with the previous network configuration. Sounds like a good change IMHO.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we intend to roll back to using a cloud neutral label/nodeset but for the short to mid term it's not an option. The infra team can't provide us the same restricted access we need on IBM cloud as we have for Vexx, once they have time to implement the needed changes we can remove the pin to Vexx.

- nodeset:
name: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl-vexxhost
nodes:
- name: controller
label: cloud-centos-9-stream-tripleo-vexxhost-medium
- name: compute-0
label: cloud-centos-9-stream-tripleo-vexxhost
- name: crc
label: coreos-crc-extracted-2-39-0-3xl
groups:
- name: computes
nodes:
- compute-0
- name: ocps
nodes:
- crc

- nodeset:
name: centos-9-crc-2-39-0-6xlarge
Expand Down