-
Notifications
You must be signed in to change notification settings - Fork 3
Add telco NFV day2ops procedures and IPI configuration for shiftstack #16
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
Open
eshulman2
wants to merge
7
commits into
shiftstack:main
Choose a base branch
from
eshulman2:NFV
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.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c4524db
Add .claude to .gitignore
eshulman2 ff52b91
Add IPI bootstrap flavor workaround and additionalTrustBundle support
eshulman2 09e3482
prepare: skip flavors that only define a name
eshulman2 b209147
day2ops: add run_procedure_no_verify task
eshulman2 38f07c4
day2ops: add telco SR-IOV/DPDK MachineSet procedures
eshulman2 52ff967
day2ops: add telco performance tuning and DPDK test procedures
eshulman2 688a84e
Add telco verification job definition and NFV setup playbook
eshulman2 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 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 |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ | |
| *.log | ||
| .vscode | ||
| .venv | ||
| .claude | ||
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
37 changes: 37 additions & 0 deletions
37
collection/stages/roles/day2ops/files/sriov-dpdk-machine-config-pools.yaml
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,37 @@ | ||
| --- | ||
| # MachineConfigPool for SRIOV worker nodes | ||
| apiVersion: machineconfiguration.openshift.io/v1 | ||
| kind: MachineConfigPool | ||
| metadata: | ||
| name: sriov | ||
| labels: | ||
| machineconfiguration.openshift.io/role: sriov | ||
| spec: | ||
| machineConfigSelector: | ||
| matchExpressions: | ||
| - key: machineconfiguration.openshift.io/role | ||
| operator: In | ||
| values: [sriov, worker] | ||
| paused: false | ||
| nodeSelector: | ||
| matchLabels: | ||
| node-role.kubernetes.io/sriov: "" | ||
|
|
||
| --- | ||
| # MachineConfigPool for DPDK worker nodes | ||
| apiVersion: machineconfiguration.openshift.io/v1 | ||
| kind: MachineConfigPool | ||
| metadata: | ||
| name: dpdk | ||
| labels: | ||
| machineconfiguration.openshift.io/role: dpdk | ||
| spec: | ||
| machineConfigSelector: | ||
| matchExpressions: | ||
| - key: machineconfiguration.openshift.io/role | ||
| operator: In | ||
| values: [dpdk, worker] | ||
| paused: false | ||
| nodeSelector: | ||
| matchLabels: | ||
| node-role.kubernetes.io/dpdk: "" |
19 changes: 19 additions & 0 deletions
19
collection/stages/roles/day2ops/files/sriov-network-operator-namespace.yaml
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,19 @@ | ||
| --- | ||
| # Namespace for SRIOV Network Operator | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: openshift-sriov-network-operator | ||
| annotations: | ||
| workload.openshift.io/allowed: management | ||
|
|
||
| --- | ||
| # OperatorGroup for SRIOV Network Operator | ||
| apiVersion: operators.coreos.com/v1 | ||
| kind: OperatorGroup | ||
| metadata: | ||
| name: sriov-network-operators | ||
| namespace: openshift-sriov-network-operator | ||
| spec: | ||
| targetNamespaces: | ||
| - openshift-sriov-network-operator |
12 changes: 12 additions & 0 deletions
12
collection/stages/roles/day2ops/files/sriov-operator-config.yaml
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,12 @@ | ||
| --- | ||
| # SriovOperatorConfig for SRIOV Network Operator | ||
| apiVersion: sriovnetwork.openshift.io/v1 | ||
| kind: SriovOperatorConfig | ||
| metadata: | ||
| name: default | ||
| namespace: openshift-sriov-network-operator | ||
| spec: | ||
| enableInjector: true | ||
| enableOperatorWebhook: true | ||
| logLevel: 2 | ||
| disableDrain: false |
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
78 changes: 78 additions & 0 deletions
78
collection/stages/roles/day2ops/tasks/procedures/apply-telco-machineset.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,78 @@ | ||
| --- | ||
| # Helper task to apply a single telco MachineSet | ||
| # This task is included by create-telco-machinesets.yml for each machineset | ||
|
|
||
| - name: "Get network details for {{ telco_machineset.networks[0].name }}" | ||
| openstack.cloud.networks_info: | ||
| cloud: "{{ user_cloud }}" | ||
| name: "{{ telco_machineset.networks[0].name }}" | ||
| register: network_0 | ||
|
|
||
| - name: "Get network details for {{ telco_machineset.networks[1].name }}" | ||
| openstack.cloud.networks_info: | ||
| cloud: "{{ user_cloud }}" | ||
| name: "{{ telco_machineset.networks[1].name }}" | ||
| register: network_1 | ||
|
|
||
| - name: Set the telco network and subnet IDs | ||
| ansible.builtin.set_fact: | ||
| network_id_0: "{{ network_0.networks[0].id }}" | ||
| network_subnet_id_0: "{{ network_0.networks[0].subnet_ids[0] }}" | ||
| network_id_1: "{{ network_1.networks[0].id }}" | ||
| network_subnet_id_1: "{{ network_1.networks[0].subnet_ids[0] }}" | ||
|
|
||
| - name: "Generate telco MachineSet manifest for {{ telco_machineset.name }}" | ||
| ansible.builtin.template: | ||
| src: telco-machineset.yaml.j2 | ||
| dest: "{{ ocp_installation_dir }}/{{ telco_machineset.name }}-machineset.yaml" | ||
| mode: u=rw,g=rw,o=r | ||
| vars: | ||
| _infrastructure_id: "{{ infrastructure_id }}" | ||
| _machine_role: "{{ telco_machineset.role | default('worker') }}" | ||
| _machineset_type: "{{ telco_machineset.type }}" | ||
| _machineset_replicas: "{{ telco_machineset.replicas }}" | ||
| _osp_flavor: "{{ telco_machineset.flavor }}" | ||
| _api_vip_port_ip: "{{ api_ip }}" | ||
| _ingress_vip_port_ip: "{{ apps_ip }}" | ||
| _machines_subnet: "{{ machines_subnet_id }}" | ||
| _machines_network: "{{ machines_subnet_net_id }}" | ||
| _security_group: "{{ machines_security_group }}" | ||
| _subnet_id_0: "{{ network_subnet_id_0 }}" | ||
| _name_suffix_0: "{{ telco_machineset.networks[0].port_name_suffix }}" | ||
| _network_id_0: "{{ network_id_0 }}" | ||
| _subnet_id_1: "{{ network_subnet_id_1 }}" | ||
| _name_suffix_1: "{{ telco_machineset.networks[1].port_name_suffix }}" | ||
| _network_id_1: "{{ network_id_1 }}" | ||
|
|
||
| - name: "Apply telco MachineSet manifest for {{ telco_machineset.name }}" | ||
| kubernetes.core.k8s: | ||
| kubeconfig: "{{ kubeconfig }}" | ||
| state: present | ||
| src: "{{ ocp_installation_dir }}/{{ telco_machineset.name }}-machineset.yaml" | ||
| wait: true | ||
| wait_timeout: "{{ manifests_wait_timeout }}" | ||
|
|
||
| - name: "Wait for cluster health after applying {{ telco_machineset.name }} machineset" | ||
| block: | ||
| - name: Wait for MCP updates | ||
| ansible.builtin.include_role: | ||
| name: tools_cluster_checks | ||
| tasks_from: wait_mcp_updated.yml | ||
| vars: | ||
| wait_retries: 60 | ||
| wait_delay: 60 | ||
|
|
||
| - name: Wait until cluster is healthy | ||
| ansible.builtin.include_role: | ||
| name: tools_cluster_checks | ||
| tasks_from: wait_until_cluster_is_healthy.yml | ||
|
|
||
| - name: Wait until nodes are ready | ||
| ansible.builtin.include_role: | ||
| name: tools_cluster_checks | ||
| tasks_from: wait_until_nodes_ready.yml | ||
|
|
||
| - name: Wait until ClusterOperators are ready | ||
| ansible.builtin.include_role: | ||
| name: tools_cluster_checks | ||
| tasks_from: wait_until_cluster_operators_ready.yml |
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.
delete_default_workers: truewithmachinesets: []- if someone includes this procedure without overriding machinesets, all workers get deleted with no replacements. Consider defaulting tofalse?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.
fixed