From 407bde205a29a09f5625228a63b49a57bb0188d8 Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Thu, 16 May 2024 13:55:56 +0200 Subject: [PATCH] [ci_gen_kustomize] Remove the dedicated ctlplaneInterface var As now the cifmw_baremetal_hosts is used outside of the scope of real BM in NFV it can happen that we have preprovisioned nodes filled in that variable. In those circumstances we won't need to fill the baremetal set with that variable. To avoid the framework to unreliably decide when that variable is needed let the user pass it if needed like the rest of the EDPM variable we are consuming. --- roles/ci_gen_kustomize_values/README.md | 4 ---- roles/ci_gen_kustomize_values/defaults/main.yml | 1 - roles/ci_gen_kustomize_values/tasks/edpm_core_asserts.yml | 8 -------- .../ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 | 2 -- .../templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 | 2 -- .../templates/sriov/edpm-nodeset-values/values.yaml.j2 | 2 -- 6 files changed, 19 deletions(-) diff --git a/roles/ci_gen_kustomize_values/README.md b/roles/ci_gen_kustomize_values/README.md index 09197efd80..9f8dfef182 100644 --- a/roles/ci_gen_kustomize_values/README.md +++ b/roles/ci_gen_kustomize_values/README.md @@ -50,10 +50,6 @@ Optional parameters: * `cifmw_ci_gen_kustomize_values_edpm_net_template_b64`: (String) The base64 content of `edpm_network_config_template`. -### Required parameters only when baremetal compute nodes are used. - -* `cifmw_ci_gen_kustomize_values_ctlplane_interface`: (String) Used to override default controlplane interface for OSP compute nodes. - ## Adding a new template The template must have a leading comment staging its source. For example, if your template is located in diff --git a/roles/ci_gen_kustomize_values/defaults/main.yml b/roles/ci_gen_kustomize_values/defaults/main.yml index 9a463f918d..0bae2f815d 100644 --- a/roles/ci_gen_kustomize_values/defaults/main.yml +++ b/roles/ci_gen_kustomize_values/defaults/main.yml @@ -74,4 +74,3 @@ ci_gen_kustomize_fetch_ocp_state: true # cifmw_ci_gen_kustomize_values_ssh_public_key # cifmw_ci_gen_kustomize_values_migration_priv_key # cifmw_ci_gen_kustomize_values_migration_pub_key -# cifmw_ci_gen_kustomize_values_ctlplane_interface diff --git a/roles/ci_gen_kustomize_values/tasks/edpm_core_asserts.yml b/roles/ci_gen_kustomize_values/tasks/edpm_core_asserts.yml index 2439340264..84c0e18b20 100644 --- a/roles/ci_gen_kustomize_values/tasks/edpm_core_asserts.yml +++ b/roles/ci_gen_kustomize_values/tasks/edpm_core_asserts.yml @@ -25,11 +25,3 @@ - cifmw_ci_gen_kustomize_values_ssh_private_key != '' - cifmw_ci_gen_kustomize_values_ssh_public_key is defined - cifmw_ci_gen_kustomize_values_ssh_public_key != '' - -- name: Ensure the required baremetal host parameters are configured. - when: - - cifmw_baremetal_hosts is defined - ansible.builtin.assert: - that: - - cifmw_ci_gen_kustomize_values_ctlplane_interface is defined - - cifmw_ci_gen_kustomize_values_ctlplane_interface != '' diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 index 4951321ff0..7d92c69d87 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 @@ -8,8 +8,6 @@ {% set _ = instances_names.append(_inst) %} {% endfor %} data: - baremetalSetTemplate: - ctlplaneInterface: {{ cifmw_ci_gen_kustomize_values_ctlplane_interface }} ssh_keys: authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }} private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }} diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 index b9c8c31849..3d4fb5cc4d 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 @@ -8,8 +8,6 @@ {% set _ = instances_names.append(_inst) %} {% endfor %} data: - baremetalSetTemplate: - ctlplaneInterface: {{ cifmw_ci_gen_kustomize_values_ctlplane_interface }} ssh_keys: authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }} private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }} diff --git a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 index fca6df3f18..8139a2dc1d 100644 --- a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 @@ -8,8 +8,6 @@ {% set _ = instances_names.append(_inst) %} {% endfor %} data: - baremetalSetTemplate: - ctlplaneInterface: {{ cifmw_ci_gen_kustomize_values_ctlplane_interface }} ssh_keys: authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }} private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}