[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.
openstack-k8s-operators · May 16, 2024 · 407bde2 · 407bde2
1 parent efda855
commit 407bde2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}