Skip to content

[multiple] Co-locate provisionserver with metal3 to prevent DHCP fail… #3738

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

Open
mnietoji wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[multiple] Co-locate provisionserver with metal3 to prevent DHCP fail… #3738

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
9 changes: 9 additions & 0 deletions ..._gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% set _ = instances_names.append(_inst) %}
{% endfor %}
Expand Down Expand Up @@ -43,3 +44,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions ...en_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% if cifmw_baremetal_hosts | default([]) | length > 0 %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% if (('label' in cifmw_baremetal_hosts[_inst]) and
Expand Down Expand Up @@ -56,3 +57,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions ...stomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% if cifmw_baremetal_hosts | default([]) | length > 0 %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% if (('label' in cifmw_baremetal_hosts[_inst]) and
Expand Down Expand Up @@ -56,3 +57,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions .../ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% set _ = instances_names.append(_inst) %}
{% endfor %}
Expand Down Expand Up @@ -43,3 +44,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% set _ = instances_names.append(_inst) %}
{% endfor %}
Expand Down Expand Up @@ -43,3 +44,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% set _ = instances_names.append(_inst) %}
{% endfor %}
Expand Down Expand Up @@ -42,3 +43,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
9 changes: 9 additions & 0 deletions roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
{% set _original_services = _original_nodeset['services'] | default([]) %}
{% set _original_baremetal_template = (original_content.data | default({})).baremetalSetTemplate | default({}) %}
{% for _inst in cifmw_baremetal_hosts.keys() %}
{% set _ = instances_names.append(_inst) %}
{% endfor %}
Expand Down Expand Up @@ -42,3 +43,11 @@ data:
- "{{ svc }}"
{% endfor %}
{% endif %}
{% if cifmw_kustomize_deploy_metal3_node is defined %}
baremetalSetTemplate:
{% for key, value in _original_baremetal_template.items() %}
{{ key }}: {{ value }}
{% endfor %}
provisionServerNodeSelector:
kubernetes.io/hostname: "{{ cifmw_kustomize_deploy_metal3_node }}"
{% endif %}
23 changes: 23 additions & 0 deletions roles/kustomize_deploy/tasks/execute_step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,29 @@
ansible.builtin.include_role:
name: run_hook

- name: Detect metal3 pod node for baremetal nodeset provisioning
when:
- not cifmw_kustomize_deploy_generate_crs_only | bool
- stage.path is defined
- stage.path is match('.*/edpm/nodeset.*')
block:
- name: Get metal3 pod information
kubernetes.core.k8s_info:
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
kind: Pod
namespace: openshift-machine-api
label_selectors:
- k8s-app=metal3
register: _cifmw_kustomize_deploy_metal3_pod_info

- name: Set metal3 node for provisionserver nodeSelector
ansible.builtin.set_fact:
cifmw_kustomize_deploy_metal3_node: "{{ _cifmw_kustomize_deploy_metal3_pod_info.resources[0].spec.nodeName }}"
cacheable: true
when:
- _cifmw_kustomize_deploy_metal3_pod_info.resources is defined
- _cifmw_kustomize_deploy_metal3_pod_info.resources | length > 0

- name: "Generate values.yaml for {{ stage.path }}"
when:
- _val.src_file is defined
Expand Down
Loading