-
Notifications
You must be signed in to change notification settings - Fork 81
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
[Draft] Add nvidia-mdev VA #412
Open
sbauza
wants to merge
1
commit into
openstack-k8s-operators:main
Choose a base branch
from
sbauza:va-nvidia-mdev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+740
−0
Open
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
This file contains 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,55 @@ | ||
| --- | ||
| vas: | ||
| nvidia-mdev: | ||
| stages: | ||
| - path: examples/va/nvidia-mdev/nncp | ||
| wait_conditions: | ||
| - >- | ||
| oc -n openstack wait nncp | ||
| -l osp/nncm-config-type=standard | ||
| --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured | ||
| --timeout=60s | ||
| values: | ||
| - name: network-values | ||
| src_file: values.yaml | ||
| build_output: nncp.yaml | ||
|
|
||
| - path: examples/va/nvidia-mdev | ||
| wait_conditions: | ||
| - >- | ||
| oc -n openstack wait osctlplane controlplane --for condition=Ready | ||
| --timeout=600s | ||
| values: | ||
| - name: network-values | ||
| src_file: nncp/values.yaml | ||
| - name: service-values | ||
| src_file: service-values.yaml | ||
| build_output: control-plane.yaml | ||
|
|
||
| - path: examples/va/nvidia-mdev/edpm/nodeset | ||
| wait_conditions: | ||
| - >- | ||
| oc -n openstack wait | ||
| osdpns openstack-edpm --for condition=SetupReady | ||
| --timeout=60m | ||
| values: | ||
| - name: edpm-nodeset-values | ||
| src_file: values.yaml | ||
| build_output: nodeset.yaml | ||
| post_stage_run: | ||
| - name: Install nvidia driver | ||
| type: playbook | ||
| # TODO: I haven't passed the secret URL but I don't know how to do it. | ||
| source: "../../playbooks/nvidia-mdev.yml" | ||
| inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml" | ||
|
|
||
| - path: examples/va/nvidia-mdev/edpm/deployment | ||
| wait_conditions: | ||
| - >- | ||
| oc -n openstack wait | ||
| osdpns openstack-edpm --for condition=Ready | ||
| --timeout=60m | ||
| values: | ||
| - name: edpm-deployment-values | ||
| src_file: values.yaml | ||
| build_output: deployment.yaml |
This file contains 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 @@ | ||
| control-plane.yaml |
This file contains 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,2 @@ | ||
| dataplane-deployment.yaml | ||
| dataplane-nodeset.yaml |
This file contains 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 @@ | ||
| dataplane-deployment.yaml |
12 changes: 12 additions & 0 deletions
12
examples/va/nvidia-mdev/edpm/deployment/kustomization.yaml
This file contains 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,12 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| components: | ||
| - ../../../../../va/nvidia-mdev/edpm/deployment | ||
| # - https://github.com/openstack-k8s-operators/architecture/va/nvidia-mdev/edpm/deployment?ref=main | ||
| ## It's possible to replace ../../../../../va/nvidia-mdev/edpm/deployment/ with a git checkout URL as per: | ||
| ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md | ||
|
|
||
| resources: | ||
| - values.yaml |
This file contains 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,10 @@ | ||
| # yamllint disable rule:line-length | ||
| # local-config: referenced, but not emitted by kustomize | ||
| --- | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: edpm-deployment-values | ||
| annotations: | ||
| config.kubernetes.io/local-config: "true" | ||
| data: {} |
This file contains 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 @@ | ||
| dataplane-nodeset.yaml |
This file contains 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,12 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| components: | ||
| - ../../../../../va/nvidia-mdev/edpm/nodeset | ||
| # - https://github.com/openstack-k8s-operators/architecture/va/nvidia-mdev/edpm/nodeset?ref=main | ||
| ## It's possible to replace ../../../../../va/nvidia-mdev/edpm/nodeset/ with a git checkout URL as per: | ||
| ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md | ||
|
|
||
| resources: | ||
| - values.yaml |
This file contains 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,160 @@ | ||
| # yamllint disable rule:line-length | ||
| # local-config: referenced, but not emitted by kustomize | ||
| --- | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: edpm-nodeset-values | ||
| annotations: | ||
| config.kubernetes.io/local-config: "true" | ||
| data: | ||
| root_password: cmVkaGF0Cg== | ||
| preProvisioned: false | ||
| baremetalSetTemplate: | ||
| ctlplaneInterface: eno2 # CHANGEME | ||
| cloudUserName: cloud-admin | ||
| provisioningInterface: enp1s0 # CHANGEME | ||
| bmhLabelSelector: | ||
| app: openstack # CHANGEME | ||
| passwordSecret: | ||
| name: baremetalset-password-secret | ||
| namespace: openstack | ||
| ssh_keys: | ||
| # Authorized keys that will have access to the dataplane computes via SSH | ||
| authorized: CHANGEME | ||
| # The private key that will have access to the dataplane computes via SSH | ||
| private: CHANGEME2 | ||
| # The public key that will have access to the dataplane computes via SSH | ||
| public: CHANGEME3 | ||
| nodeset: | ||
| ansible: | ||
| ansibleUser: cloud-admin | ||
| ansiblePort: 22 | ||
| ansibleVars: | ||
| # CHANGEME -- see https://access.redhat.com/solutions/253273 | ||
| # edpm_bootstrap_command: | | ||
| # subscription-manager register --username <subscription_manager_username> --password <subscription_manager_password> | ||
| # podman login -u <registry_username> -p <registry_password> registry.redhat.io | ||
| timesync_ntp_servers: | ||
| - hostname: pool.ntp.org | ||
| # CPU pinning settings | ||
| edpm_kernel_args: "default_hugepagesz=1GB hugepagesz=1G hugepages=16 intel_iommu=on iommu=pt isolcpus=4-23,28-47" | ||
| edpm_tuned_profile: "cpu-partitioning-powersave" | ||
| edpm_tuned_isolated_cores: "4-23,28-47" | ||
| # edpm_network_config | ||
| # These vars are edpm_network_config role vars | ||
| edpm_network_config_hide_sensitive_logs: false | ||
| edpm_network_config_os_net_config_mappings: | ||
| edpm-compute-0: | ||
| nic2: 6c:fe:54:3f:8a:02 # CHANGEME | ||
| nic3: 6c:fe:54:3f:8a:03 # CHANGEME | ||
| edpm-compute-1: | ||
| nic2: 6b:fe:54:3f:8a:02 # CHANGEME | ||
| nic3: 6b:fe:54:3f:8a:03 # CHANGEME | ||
| edpm_network_config_template: | | ||
| --- | ||
| {% set mtu_list = [ctlplane_mtu] %} | ||
| {% for network in nodeset_networks %} | ||
| {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} | ||
| {%- endfor %} | ||
| {% set min_viable_mtu = mtu_list | max %} | ||
| network_config: | ||
| - type: ovs_bridge | ||
| name: {{ neutron_physical_bridge_name }} | ||
| mtu: {{ min_viable_mtu }} | ||
| use_dhcp: false | ||
| dns_servers: {{ ctlplane_dns_nameservers }} | ||
| domain: {{ dns_search_domains }} | ||
| addresses: | ||
| - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} | ||
| routes: {{ ctlplane_host_routes }} | ||
| members: | ||
| - type: interface | ||
| name: nic2 | ||
| mtu: {{ min_viable_mtu }} | ||
| # force the MAC address of the bridge to this interface | ||
| primary: true | ||
| {% for network in nodeset_networks %} | ||
| - type: vlan | ||
| mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} | ||
| vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} | ||
| addresses: | ||
| - ip_netmask: | ||
| {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} | ||
| routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} | ||
| {% endfor %} | ||
| - type: sriov_pf | ||
| name: nic3 | ||
| numvfs: 10 | ||
| use_dhcp: false | ||
| promisc: true | ||
|
|
||
| # These vars are for the network config templates themselves and are | ||
| # considered EDPM network defaults. | ||
| neutron_physical_bridge_name: br-ex | ||
| neutron_public_interface_name: eth0 | ||
| # edpm_nodes_validation | ||
| edpm_nodes_validation_validate_controllers_icmp: false | ||
| edpm_nodes_validation_validate_gateway_icmp: false | ||
| dns_search_domains: [] | ||
| gather_facts: false | ||
| # edpm firewall, change the allowed CIDR if needed | ||
| edpm_sshd_configure_firewall: true | ||
| edpm_sshd_allowed_ranges: | ||
| - 192.168.122.0/24 | ||
| # SRIOV settings | ||
| edpm_neutron_sriov_agent_SRIOV_NIC_physical_device_mappings: 'sriov-phy4:eno4' | ||
| networks: | ||
| - defaultRoute: true | ||
| name: ctlplane | ||
| subnetName: subnet1 | ||
| - name: internalapi | ||
| subnetName: subnet1 | ||
| - name: storage | ||
| subnetName: subnet1 | ||
| - name: tenant | ||
| subnetName: subnet1 | ||
| nodes: | ||
| edpm-compute-0: | ||
| hostName: edpm-compute-0 | ||
| edpm-compute-1: | ||
| hostName: edpm-compute-1 | ||
| services: | ||
| - bootstrap | ||
| - download-cache | ||
| - configure-network | ||
| - validate-network | ||
| - install-os | ||
| - configure-os | ||
| - ssh-known-hosts | ||
| - run-os | ||
| - reboot-os | ||
| - install-certs | ||
| - libvirt | ||
| - ovn | ||
| - neutron-ovn | ||
| - nova-custom-sriov | ||
| - neutron-sriov | ||
| - neutron-metadata | ||
| nova: | ||
| compute: | ||
| conf: | | ||
| # CHANGEME | ||
| [DEFAULT] | ||
| reserved_host_memory_mb = 4096 | ||
| reserved_huge_pages = node:0,size:4,count:524160 | ||
| reserved_huge_pages = node:1,size:4,count:524160 | ||
| [compute] | ||
| cpu_shared_set = 0-3,24-27 | ||
| cpu_dedicated_set = 8-23,32-47 | ||
| [devices] | ||
| mdev_enabled_types = nvidia-268 | ||
| migration: | ||
| ssh_keys: | ||
| private: CHANGEME4 | ||
| public: CHANGEME5 | ||
| pci: | ||
| conf: | | ||
| # CHANGEME | ||
| [pci] | ||
| device_spec = {"vendor_id":"8086", "product_id":"1572", "address": "0000:19:00.3", "physical_network":"sriov-phy4", "trusted":"true"} |
This file contains 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,13 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| components: | ||
| - ../../../va/nvidia-mdev/ | ||
| # - https://github.com/openstack-k8s-operators/architecture/va/nvidia-mdev?ref=main | ||
| ## It's possible to replace ../../../va/nvidia-mdev/ with a git checkout URL as per: | ||
| ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md | ||
|
|
||
| resources: | ||
| - nncp/values.yaml | ||
| - service-values.yaml |
This file contains 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 @@ | ||
| nncp.yaml |
This file contains 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,24 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| transformers: | ||
| # Set namespace to OpenStack on all namespaced objects without a namespace | ||
| - |- | ||
| apiVersion: builtin | ||
| kind: NamespaceTransformer | ||
| metadata: | ||
| name: _ignored_ | ||
| namespace: openstack | ||
| setRoleBindingSubjects: none | ||
| unsetOnly: true | ||
| fieldSpecs: | ||
| - path: metadata/name | ||
| kind: Namespace | ||
| create: true | ||
|
|
||
| components: | ||
| - ../../../../va/nvidia-mdev/nncp | ||
|
|
||
| resources: | ||
| - values.yaml | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I missed this, since you are not doing anything unique to nncp this will fail to find anything in the directory path listed. Since we don't need to do anything unique here you can point to the lib path instead:
../../../../lib/nncp