Merge pull request #765 from Bhagyashree-shetty/devel

Issue #764: Fix for issues JIT-220380 and JIT-220370

control_plane/roles/provision_cobbler/files/inventory_creation.yml

@@ -10,7 +10,7 @@
     - name: Read dhcp file for leap
       set_fact:
         var: "{{ lookup('file', '/var/lib/dhcp/db/dhcpd.leases').split()| unique | select| list }}"
-      when: ansible_facts['distribution'] | lower == "leap"
+      when: ("leap" in ansible_facts['distribution'] | lower)
     
     - name: Filter the ip
       set_fact:

control_plane/roles/provision_cobbler/files/tftp.yml

@@ -37,7 +37,7 @@
 
         - name: Start tftp.socket
           command: systemctl start tftp.socket
-      when: ansible_facts['distribution'] | lower == "leap"
+      when: ("leap" in ansible_facts['distribution'] | lower)
 
     - name: Fetch tftp status
       command: systemctl is-active tftp

control_plane/roles/provision_cobbler/tasks/cobbler_image.yml

@@ -30,7 +30,7 @@
     chdir: "{{ role_path }}/files/"
   when: 
     - not cobbler_image_status
-    - mgmt_os == os_supported_leap
+    - os_supported_leap in mgmt_os 
   tags: install
 
 - name: Update image name in k8s_cobbler.yml

control_plane/roles/provision_cobbler/tasks/configure_cobbler.yml

@@ -57,7 +57,7 @@
   tags: install
   when:
     - not cobbler_config_status
-    - mgmt_os == os_supported_leap
+    - os_supported_leap in mgmt_os 
     - not provision_os_change
 
 - name: Configuring cobbler for multiple profile support

control_plane/roles/provision_cobbler/tasks/dhcp_configure.yml

@@ -97,4 +97,4 @@
         path: "{{ role_path }}/files/tftp"
         regexp: '^        server_args             = -s /var/lib/tftpboot'
         replace: '        server_args             = -s /srv/tftpboot'
-  when: mgmt_os == os_supported_leap
+  when: os_supported_leap in mgmt_os 

control_plane/roles/provision_cobbler/tasks/mount_iso.yml

@@ -32,7 +32,7 @@
   when: not check_iso_dir.stat.exists
 
 - name: Check mountpoint
-  command: mountpoint /mnt/
+  command: mountpoint /mnt/{{ provision_os }}
   changed_when: false
   register: result
   failed_when: false