Forráskód Böngészése

Issue #392: Removal of slurm rpm installation

Signed-off-by: DeepikaKrishnaiah <deepika_k2@dell.com>
Lucas A. Wilson 3 éve
szülő
commit
47dc94a1c1

+ 2 - 2
control_plane/roles/control_plane_device/tasks/mngmnt_network_container_image.yml

@@ -29,8 +29,8 @@
 - name: Update omnia project path in k8s_mngmnt_network.yml
   replace:
     path: "{{ role_path }}/files/k8s_mngmnt_network.yml"
-    regexp: 'path: /root/omnia'
-    replace: "path: {{ role_path.split('control_plane')[0] }}"
+    regexp: '        - name: omnia-storage\n          hostPath:\n            path:.*'
+    replace: "        - name: omnia-storage\n          hostPath:\n            path: {{ role_path.split('control_plane')[0] }}"
 
 - name: Deploy mngmnt_network pod
   command: "kubectl apply -f {{ role_path }}/files/k8s_mngmnt_network.yml"

+ 2 - 2
control_plane/roles/control_plane_ib/tasks/infiniband_container_image.yml

@@ -29,8 +29,8 @@
 - name: Update omnia project path in k8s_infiniband.yml
   replace:
     path: "{{ role_path }}/files/k8s_infiniband.yml"
-    regexp: 'path: /root/omnia'
-    replace: "path: {{ role_path.split('control_plane')[0] }}"
+    regexp: '        - name: omnia-storage\n          hostPath:\n            path:.*'
+    replace: "        - name: omnia-storage\n          hostPath:\n            path: {{ role_path.split('control_plane')[0] }}"
 
 - name: Deploy infiniband pod
   command: "kubectl apply -f {{ role_path }}/files/k8s_infiniband.yml"

+ 3 - 0
control_plane/roles/control_plane_k8s/tasks/k8s_helm.yml

@@ -31,6 +31,9 @@
 - name: Install helm
   command: "/bin/bash {{ helm_installer_file_dest }}"
   changed_when: true
+  register: install_helm_result
+  until: install_helm_result is not failed
+  retries: 20
 
 - name: Helm - add stable repo
   command: "helm repo add stable '{{ helm_stable_repo_url }}'"

+ 2 - 2
control_plane/roles/provision_cobbler/tasks/cobbler_image.yml

@@ -29,8 +29,8 @@
 - name: Update omnia project path in k8s_cobbler.yml
   replace:
     path: "{{ role_path }}/files/k8s_cobbler.yml"
-    regexp: 'path: /root/omnia'
-    replace: "path: {{ role_path.split('control_plane')[0] }}"
+    regexp: '        - name: omnia-storage\n          hostPath:\n            path:.*'
+    replace: "        - name: omnia-storage\n          hostPath:\n            path: {{ role_path.split('control_plane')[0] }}"
 
 - name: Deploy cobbler pod
   command: "kubectl apply -f {{ role_path }}/files/k8s_cobbler.yml"

+ 0 - 42
roles/slurm_manager/tasks/main.yml

@@ -59,48 +59,6 @@
     state: present
   tags: install
 
-- name: Verify if slurm is installed
-  shell: rpm -qa | grep slurm
-  ignore_errors: true
-  register: verify_result
-  changed_when: no
-  failed_when: no
-  args:
-    warn: no
-
-- name: Create temporary download folder for slurm
-  file:
-    path: "{{ tmp_path }}"
-    owner: slurm
-    group: slurm
-    mode: "{{ tmp_mode }}"
-    state: directory
-  when: verify_result.rc != 0
-
-- name: Download slurm source
-  get_url:
-    url: "{{ slurm_url }}"
-    dest: "{{ tmp_path }}"
-    checksum: "{{ slurm_md5 }}"
-    validate_certs: no
-  tags: install
-  when: verify_result.rc != 0
-
-- name: Build slurm rpms
-  command: rpmbuild -ta "{{ rpmbuild_path }}" --with mysql
-  changed_when: false
-  when: verify_result.rc != 0
-  args:
-    warn: no
-
-- name: Install rpms
-  command: rpm -Uvh ~"{{ rpm_loop }}"
-  args:
-    chdir: "{{ rpm_path }}"
-    warn: no
-  changed_when: true
-  when: verify_result.rc != 0
-
 - name: Get the hostname
   command: hostname
   register: machine_name

+ 1 - 7
roles/slurm_manager/vars/main.yml

@@ -45,16 +45,11 @@ log_files_manager:
    - slurm_jobacct.log
    - slurm_jobcomp.log
 
-tmp_path: "/root/slurm-tmp"
 tmp_mode: "0755"
 cluster_state_path: "/var/spool/slurm/cluster_state"
 spool_slurmctld_pth: "/var/spool/slurmctld"
 spool_slurmd_pth: "/var/spool/slurmd"
 slurm_logpth: "/var/log/slurm/"
-slurm_url: https://download.schedmd.com/slurm/slurm-20.11.7.tar.bz2
-slurm_md5: "md5:0f5c768d3e895030f286120c3591912f"
-rpmbuild_path: "/root/slurm-tmp/slurm-20.11.7.tar.bz2"
-rpm_loop: "/rpmbuild/RPMS/x86_64/*.rpm"
 tcp_port1: "6817/tcp"
 tcp_port2: "6818/tcp"
 tcp_port3: "6819/tcp"
@@ -74,5 +69,4 @@ DbdHost: "localhost"
 logfile: "/var/log/slurm/slurmdbd.log"
 pidfile: "/var/run/slurmdbd.pid"
 buffer_path: "/tmp/slurm.conf"
-rpm_path: "/root/rpmbuild/RPMS/x86_64/"
-slurm_mode: "0644"
+slurm_mode: "0644"

+ 0 - 42
roles/slurm_workers/tasks/main.yml

@@ -65,48 +65,6 @@
     state: present
   tags: install
 
-- name: Verify if slurm is installed
-  shell: rpm -qa | grep slurm
-  ignore_errors: true
-  register: verify_result
-  changed_when: no
-  failed_when: no
-  args:
-    warn: no
-
-- name: Create temporary download folder for slurm
-  file:
-    path: "{{ tmp_path }}"
-    owner: slurm
-    group: slurm
-    mode: "{{ tmp_mode }}"
-    state: directory
-  when: verify_result.rc != 0
-
-- name: Download slurm source
-  get_url:
-    url: "{{ slurm_url }}"
-    dest: "{{ tmp_path }}"
-    checksum: "{{ slurm_md5 }}"
-    validate_certs: no
-  tags: install
-  when: verify_result.rc != 0
-
-- name: Build slurm rpms
-  command: rpmbuild -ta "{{ rpmbuild_path }}" --with mysql
-  changed_when: false
-  when: verify_result.rc != 0
-  args:
-    warn: no
-
-- name: Install rpms
-  command: rpm -Uvh ~"{{ rpm_loop }}"
-  args:
-    chdir: "{{ rpm_path }}"
-    warn: no
-  changed_when: true
-  when: verify_result.rc != 0
-
 - name: Get the hostname
   command: hostname
   register: machine_name