Selaa lähdekoodia

Merge pull request #827 from Shubhangi-dell/bugfix

#713 rocky.ks not found
Sujit Jadhav 3 vuotta sitten
vanhempi
commit
c8b9a104d8

+ 1 - 1
control_plane/roles/provision_cobbler/tasks/check_prerequisites.yml

@@ -142,7 +142,7 @@
     cobbler_config_status: true
   when:
     - cobbler_container_status
-    - (provision_os in cobbler_profile_list.stdout) or (previous_os in cobbler_profile_list.stdout)
+    - (provision_os in cobbler_profile_list.stdout) or (previous_os in cobbler_profile_list.stdout) or ( "" in cobbler_profile_list.stdout)
     - "'* * * * * /usr/bin/ansible-playbook /root/tftp.yml' in crontab_list.stdout"
     - "'*/5 * * * * /usr/bin/ansible-playbook /root/inventory_creation.yml' in crontab_list.stdout"
 

+ 28 - 20
control_plane/roles/provision_cobbler/tasks/main.yml

@@ -19,46 +19,55 @@
   include_tasks: check_prerequisites.yml
 
 - name: Multi profile creation
-  import_tasks: multi_profile_creation.yml
+  include_tasks: multi_profile_creation.yml
   when: provision_os_change
 
 - name: Cobbler pod creation
   block:
     - name: Mount iso image
-      import_tasks: mount_iso.yml
-      when: not cobbler_image_status
+      include_tasks: mount_iso.yml
+      when:
+        - not cobbler_image_status
 
     - name: Modify firewall settings for Cobbler
-      import_tasks: firewall_settings.yml
-      when: not cobbler_container_status
+      include_tasks: firewall_settings.yml
+      when:
+        - not cobbler_container_status
 
     - name: Include common variables
       include_vars: ../../control_plane_common/vars/main.yml
-      when: not cobbler_container_status
+      when:
+        - not cobbler_container_status
 
     - name: Internet validation
       include_tasks: ../../control_plane_common/tasks/internet_validation.yml
-      when: not cobbler_container_status
+      when:
+        - not cobbler_container_status
 
     - name: Dhcp Configuration
-      import_tasks: dhcp_configure.yml
-      when: (not cobbler_image_status) or ( backup_map_status )
+      include_tasks: dhcp_configure.yml
+      when:
+        - ( not cobbler_image_status ) or ( backup_map_status ) or ( not cobbler_container_status )
 
     - name: Provision password validation
-      import_tasks: provision_password.yml
-      when: not cobbler_image_status
+      include_tasks: provision_password.yml
+      when:
+        - ( not cobbler_image_status ) or ( not cobbler_container_status )
 
     - name: Mapping file validation
-      import_tasks: mapping_file.yml
-      when: (not cobbler_image_status) and (host_mapping_file) or ( backup_map_status)
+      include_tasks: mapping_file.yml
+      when:
+        - ( not cobbler_image_status ) and ( host_mapping_file ) or ( backup_map_status )
 
     - name: Cobbler image creation
-      import_tasks: cobbler_image.yml
-      when: not cobbler_container_status
+      include_tasks: cobbler_image.yml
+      when:
+        - not cobbler_container_status
 
     - name: Cobbler configuration
-      import_tasks: configure_cobbler.yml
-      when: not cobbler_config_status
+      include_tasks: configure_cobbler.yml
+      when:
+        - not cobbler_config_status
 
     - name: Cobbler container status message
       block:
@@ -71,6 +80,5 @@
           debug:
             msg: "{{ message_installed }}"
             verbosity: 2
-          when: not cobbler_container_status
-      tags: install
-  when: not provision_os_change
+          when:	not cobbler_container_status
+  when: not provision_os_change