Merge branch 'main' into fix-checks

redhat-partner-solutions · Nov 24, 2023 · cbd1ffa · cbd1ffa
2 parents 97e9301 + fa2663a
commit cbd1ffa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/roles/process_nmstate/templates/nmstate.yml.j2 b/roles/process_nmstate/templates/nmstate.yml.j2
@@ -36,9 +36,11 @@ interfaces:
     link-aggregation:
       mode: {{ interface.link_aggregation.mode | default('active-backup') }}
       options: {{ interface.link_aggregation.options | default([]) | to_json  }}
-      slaves:
-        {% for slave in interface.link_aggregation.slaves %}
-        - {{ slave }}
+      port:
+        {% set old_ports = ((interface.link_aggregation.slaves | default([])) | list) %}
+        {% set ports = ((interface.link_aggregation.ports | default([])) | list) + old_ports %}
+        {% for port in ports %}
+        - {{ port }}
         {% endfor %}
     {% endif %}
     {% if (interface.type | default('ethernet')) == 'vlan' %}

diff --git a/roles/vendors/pxe/tasks/disk.yml b/roles/vendors/pxe/tasks/disk.yml
@@ -7,7 +7,7 @@
     port: "{{ bmc_port }}"
     state: "off"
 
-- name: Set server to boot from network
+- name: Set server to boot from disk
   community.general.ipmi_boot:
     name: "{{ bmc_address }}"
     user: "{{ bmc_user }}"