-
Notifications
You must be signed in to change notification settings - Fork 141
[reproducers][nfv] Add Networker node to deployment #2686
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.
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
Merged
evallesp
merged 1 commit into
openstack-k8s-operators:main
from
rdiazcam:nfv_networker_poc
Apr 25, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
roles/ci_gen_kustomize_values/tasks/edpm_compute_nodeset_values.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| edpm_nodeset_values.yml |
1 change: 1 addition & 0 deletions
1
roles/ci_gen_kustomize_values/tasks/edpm_networker_nodeset_values.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| edpm_nodeset_values.yml |
59 changes: 59 additions & 0 deletions
59
...omize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| # source: ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 | ||
| {% set instance_names = [] %} | ||
| {% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %} | ||
| {% set _original_nodes = _original_nodeset.nodes | default({}) %} | ||
| {% set _original_services = _original_nodeset['services'] | default([]) %} | ||
| {% if cifmw_baremetal_hosts | default([]) | length > 0 %} | ||
| {% for _inst in cifmw_baremetal_hosts.keys() %} | ||
| {% if (('label' in cifmw_baremetal_hosts[_inst]) and | ||
| (cifmw_baremetal_hosts[_inst]['label'] == 'openstack-' ~ node_type)) %} | ||
| {% set _ = instance_names.append(_inst) %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| {% else %} | ||
| # Needed for verification gate | ||
| {% set _vm_type = (_original_nodes.keys() | first).split('-')[1] %} | ||
| {% for _inst in cifmw_networking_env_definition.instances.keys() %} | ||
| {% if _inst.startswith(_vm_type) %} | ||
| {% set _ = instance_names.append(_inst) %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| {% endif %} | ||
| data: | ||
| ssh_keys: | ||
| authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }} | ||
| private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }} | ||
| public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }} | ||
| {% if node_type == 'compute' %} | ||
| nova: | ||
| migration: | ||
| ssh_keys: | ||
| private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }} | ||
| public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }} | ||
| {% endif %} | ||
| nodeset: | ||
| ansible: | ||
| ansibleVars: | ||
| edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}" | ||
| timesync_ntp_servers: | ||
| - hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}" | ||
| {% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0 %} | ||
| edpm_sshd_allowed_ranges: | ||
| {% for range in cifmw_ci_gen_kustomize_values_sshd_ranges %} | ||
| - "{{ range }}" | ||
| {% endfor %} | ||
| {% endif %} | ||
| nodes: | ||
| {% for instance in instance_names %} | ||
| edpm-{{ instance }}: | ||
| hostName: {{ instance }} | ||
| {% endfor %} | ||
|
|
||
| {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and | ||
| ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services) %} | ||
| services: | ||
| - "repo-setup" | ||
| {% for svc in _original_services %} | ||
| - "{{ svc }}" | ||
| {% endfor %} | ||
| {% endif %} | ||
4 changes: 4 additions & 0 deletions
4
...mize_values/templates/ovs-dpdk-sriov-networker/edpm-compute-nodeset-values/values.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| # source: ovs-dpdk-sriov-networker/edpm-compute-nodeset-values/values.yaml.j2 | ||
| {% set node_type = "compute" %} | ||
| {% include 'templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2' %} |
4 changes: 4 additions & 0 deletions
4
...ze_values/templates/ovs-dpdk-sriov-networker/edpm-networker-nodeset-values/values.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| # source: ovs-dpdk-sriov-networker/edpm-networker-nodeset-values/values.yaml.j2 | ||
| {% set node_type = "networker" %} | ||
| {% include 'templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2' %} |
117 changes: 117 additions & 0 deletions
117
scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-networker.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| --- | ||
| cifmw_architecture_scenario: "ovs-dpdk-sriov-networker" | ||
|
|
||
| # Automation section. Most of those parameters will be passed to the | ||
| # controller-0 as-is and be consumed by the `deploy-va.sh` script. | ||
| # Please note, all paths are on the controller-0, meaning managed by the | ||
| # Framework. Please do not edit them! | ||
| _arch_repo: "{{ cifmw_architecture_repo | default('/home/zuul/src/github.com/openstack-k8s-operators/architecture') }}" | ||
|
|
||
| # HERE if you want to override kustomization, you can uncomment this parameter | ||
| # and push the data structure you want to apply. | ||
| # cifmw_architecture_user_kustomize: | ||
| # stage_0: | ||
| # 'network-values': | ||
| # data: | ||
| # starwars: Obiwan | ||
|
|
||
| # HERE, if you want to stop the deployment loop at any stage, you can uncomment | ||
| # the following parameter and update the value to match the stage you want to | ||
| # reach. Known stages are: | ||
| # pre_kustomize_stage_INDEX | ||
| # pre_apply_stage_INDEX | ||
| # post_apply_stage_INDEX | ||
| # | ||
| # cifmw_deploy_architecture_stopper: | ||
|
|
||
| cifmw_libvirt_manager_net_prefix_add: false | ||
| cifmw_libvirt_manager_fixed_networks: | ||
| - ocpbm | ||
| - ocppr | ||
| - osp_external | ||
| - osp_trunk | ||
|
|
||
| cifmw_libvirt_manager_configuration: | ||
| networks: | ||
| ocpbm: | | ||
| <network> | ||
| <name>ocpbm</name> | ||
| <forward mode='bridge' /> | ||
| <bridge name='ocpbm' /> | ||
| </network> | ||
| ocppr: | | ||
| <network> | ||
| <name>ocppr</name> | ||
| <forward mode='bridge' /> | ||
| <bridge name='ocppr' /> | ||
| </network> | ||
| osp_external: | | ||
| <network> | ||
| <name>osp_external</name> | ||
| <forward mode='bridge' /> | ||
| <bridge name='osp_external' /> | ||
| </network> | ||
| osp_trunk: | | ||
| <network> | ||
| <name>osp_trunk</name> | ||
| <forward mode='bridge' /> | ||
| <bridge name='osp_trunk' /> | ||
| </network> | ||
| vms: | ||
| controller: | ||
| uefi: "{{ cifmw_use_uefi }}" | ||
| root_part_id: "{{ cifmw_root_partition_id }}" | ||
| image_url: "{{ cifmw_discovered_image_url }}" | ||
| sha256_image_name: "{{ cifmw_discovered_hash }}" | ||
| image_local_dir: "{{ cifmw_basedir }}/images/" | ||
| disk_file_name: "base-os.qcow2" | ||
| disksize: 50 | ||
| memory: 8 | ||
| cpus: 4 | ||
| nets: | ||
| - ocpbm | ||
| - osp_trunk | ||
| ocp: | ||
| amount: 3 | ||
| uefi: true | ||
| root_part_id: 4 | ||
| admin_user: core | ||
| image_local_dir: "{{ cifmw_basedir }}/images/" | ||
| disk_file_name: "ocp_master" | ||
| disksize: "100" | ||
| extra_disks_num: 3 | ||
| extra_disks_size: "50G" | ||
| cpus: 10 | ||
| memory: 32 | ||
| nets: | ||
| - ocppr | ||
| - ocpbm | ||
| - osp_trunk | ||
| - osp_external | ||
|
|
||
| # Note: with that extra_network_names "osp_trunk", we instruct | ||
| # devscripts role to create a new network, and associate it to | ||
| # the OCP nodes. This one is a "private network", and will hold | ||
| # the VLANs used for network isolation. | ||
|
|
||
| # Please create a custom env file to provide: | ||
| # cifmw_devscripts_ci_token: | ||
| # cifmw_devscripts_pull_secret: | ||
|
|
||
| # Baremetal host configuration | ||
| cifmw_config_bmh: true | ||
|
|
||
| # BMH are deployed in a differnt NS than the secret OSP BMO | ||
| # references in each BMH. Metal3 requires the referenced | ||
| # secrets to be in the same NS or be allowed to access them | ||
| cifmw_openshift_setup_metal3_watch_all_ns: true | ||
|
|
||
| # Use EDPM image for computes | ||
| cifmw_update_containers_edpm_image_url: "{{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}" | ||
|
|
||
| # Set Logical Volume Manager Storage by default for local storage | ||
| cifmw_use_lvms: true | ||
| cifmw_lvms_disk_list: | ||
| - /dev/vda | ||
| - /dev/vdb | ||
| - /dev/vdc |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.