Logic fixes for roles changes to node enrollment step

enroll.yaml

@@ -6,5 +6,4 @@
   gather_facts: yes
   roles:
     - role: ironic-enroll
-      baremetal_csv_file: "{{ baremetal_csv_file }}"
-      ipmi_bridging: "{{ ipmi_bridging|default('no') }}" 
+      baremetal_csv_file: "{{ baremetal_csv_file | mandatory }}"

roles/ironic-enroll/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-# defaults file for ironic-enroll
+ipmi_bridging: "no"

roles/ironic-enroll/tasks/main.yml

@@ -10,13 +10,13 @@
   when: test_baremetal_csv_file.stat.isreg == false
 - name: "If testing, enroll virtual machines."
   include: virtual_enroll.yaml
-  when: testing == true
+  when: testing == "true"
 - name: "If no ipmi_bridging value set, or a value of no exists, execute standard sequence."
   include: standard_enroll.yaml
-  when: testing == false and (ipmi_bridging is not defined or ipmi_bridging == "no")
+  when: (ipmi_bridging != "single" and ipmi_bridging != "dual") and (testing != "true")
 - name: "If ipmi_bridging is set to single, execute single bridge enrollment sequence.."
   include: ipmi_bridging_single_enroll.yaml
-  when: testing == false and (ipmi_bridging is defined and ipmi_bridging == "single")
+  when: testing != "true" and (ipmi_bridging is defined and ipmi_bridging == "single")
 - name: "If ipmi_bridging is set to single, execute dual bridge enrollment sequence.."
   include: ipmi_bridging_dual_enroll.yaml
-  when: testing == false and (ipmi_bridging is defined and ipmi_bridging == "dual")
+  when: testing != "true" and (ipmi_bridging is defined and ipmi_bridging == "dual")

roles/ironic-enroll/vars/main.yml

@@ -1,3 +1,2 @@
 ---
 # vars file for ironic-enroll
-ipmi_bridging: no