Merge branch 'devel' into grafana-visualization

control_plane/roles/control_plane_k8s/tasks/k8s_installation_leap.yml

@@ -1,4 +1,4 @@
-#  Copyright 2021 Dell Inc. or its subsidiaries. All Rights Reserved.
+#  Copyright 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -55,11 +55,23 @@
   changed_when: true
 
 - name: Installing cri-o
-  zypper:
+  package:
     name: cri-o
     state: present
   changed_when: true
 
+- name: Installing cri-o tools
+  package:
+    name: cri-tools
+    state: present
+  changed_when: true
+
+- name: Reloading deamon
+  command: systemctl daemon-reload
+  changed_when: true
+  args:
+    warn: false
+
 - name: Start and enable crio
   service:
     name: crio
@@ -68,13 +80,14 @@
     enabled: yes
   register: crio_repo_result
   until: crio_repo_result is not failed
-  retries: "{{ min_retries }}"
+  retries: "{{ max_retries }}"
 
 - name: Add kubernetes repo
   zypper_repository:
      name: google-k8s
      repo: "{{ k8s_repo_leap }}"
      state: present
+     disable_gpg_check: yes
      autorefresh: yes
 
 - name: Import rpm-package key for installing kubernetes
@@ -94,7 +107,7 @@
   changed_when: false
 
 - name: Refresh repositories and installing conntrack-tools
-  zypper:
+  package:
     name: conntrack-tools
     state: present
     update_cache: yes
@@ -111,6 +124,9 @@
     responses:
         (.*) [1/2/c/d/?](.): '2'
         (.*)(y): 'y'
+  register: kubeadm_status
+  until: kubeadm_status is not failed
+  retries: "{{ max_retries }}"
 
 - name: Install Kubelet
   ansible.builtin.expect:
@@ -118,6 +134,9 @@
     responses:
         (.*) [1/2/c/d/?](.): '2'
         (.*)(y): 'y'
+  register: kubelet_status
+  until: kubelet_status is not failed
+  retries: "{{ max_retries }}"
 
 - name: Install Kubectl
   zypper:
@@ -125,10 +144,13 @@
      state: present
      oldpackage: yes
      force: yes
+  register: kubectl_status
+  until: kubectl_status is not failed
+  retries: "{{ max_retries }}"
 
 - name: Install common packages
   zypper:
-    name: "{{ common_pkgs_leap }}"
+    name: "{{ common_packages }}"
     state: present
 
 - name: Versionlocking kubeadm
@@ -161,7 +183,7 @@
   tags: install
 
 - name: Install docker-compose
-  zypper:
+  package:
     name: docker-compose
     state: present
   when: docker_username and docker_password
@@ -174,7 +196,7 @@
     enabled: yes
   register: crio_repo_result
   until: crio_repo_result is not failed
-  retries: "{{ min_retries }}"
+  retries: "{{ max_retries }}"
 
 - name: Start and enable kubernetes - kubelet
   service:

control_plane/roles/control_plane_k8s/tasks/main.yml

@@ -15,9 +15,7 @@
 
 - name: Install K8s packages
   include_tasks: k8s_installation.yml
-  when:
-    - ( mgmt_os == os_supported_centos ) and ( ansible_distribution_version >= os_supported_centos_version ) or
-      ( mgmt_os == os_supported_rocky ) and ( ansible_distribution_version >= os_supported_rocky_version )
+  when: os_supported_leap not in mgmt_os
 
 - name: Install K8s packages for leap
   include_tasks: k8s_installation_leap.yml
@@ -33,4 +31,4 @@
   import_tasks: k8s_init.yml
 
 - name: Deploy K8s dashboard
-  import_tasks: k8s_services.yml
+  import_tasks: k8s_services.yml

control_plane/roles/control_plane_k8s/vars/main.yml

@@ -25,14 +25,10 @@ docker_repo_dest_leap: /etc/YaST2/docker-ce.repo
 kubeadm_version: kubeadm-1.21.0-0.x86_64
 kubelet_version: kubelet-1.21.0-0.x86_64
 kubectl_version: kubectl-1.21.0-0.x86_64
-common_pkgs_leap:
-  - openssl
-  - bash-completion
-  - buildah
 os_supported_leap: "leap"
 os_supported_leap_version: "15.3"
 min_retries: 3
-max_retries: 3
+max_retries: 10
 min_delay: 10
 wait_time: 30
  

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"
 

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