Selaa lähdekoodia

Merge pull request #276 from abhishek-s-a/devel

Issue #275: Docker version fix
Lucas A. Wilson 4 vuotta sitten
vanhempi
commit
9f730173f6

+ 9 - 0
appliance/roles/common/tasks/docker_installation.yml

@@ -65,6 +65,15 @@
     executable: pip3
   tags: install
 
+- name: Versionlock docker
+  command: "yum versionlock '{{ item }}'"
+  args:
+    warn: false
+  with_items:
+    - "{{ container_repo_install }}"
+  changed_when: true
+  tags: install
+
 - name: Configure docker
   copy:
     src: daemon.json

+ 4 - 1
appliance/roles/common/vars/main.yml

@@ -33,6 +33,7 @@ common_packages:
   - python-docker
   - net-tools
   - python-netaddr
+  - yum-plugin-versionlock
 
 # Usage: pre_requisite.yml
 internet_delay: 0
@@ -52,7 +53,9 @@ docker_repo_url: https://download.docker.com/linux/centos/docker-ce.repo
 docker_repo_dest: /etc/yum.repos.d/docker-ce.repo
 success: '0'
 container_type: docker
-container_repo_install: docker-ce
+container_repo_install:
+  - docker-ce-cli-20.10.2
+  - docker-ce-20.10.2
 docker_compose: docker-compose
 daemon_dest: /etc/docker/
 

+ 9 - 0
roles/common/tasks/main.yml

@@ -62,6 +62,15 @@
     state: present
   tags: install
 
+- name: Versionlock docker
+  command: "yum versionlock '{{ item }}'"
+  args:
+    warn: false
+  with_items:
+    - "{{ docker_packages }}"
+  changed_when: true
+  tags: install
+
 - name: Collect host facts (including acclerator information)
   setup: ~
 

+ 7 - 2
roles/common/vars/main.yml

@@ -23,9 +23,14 @@ common_packages:
   - nvidia-detect
   - chrony
   - pciutils
-  - docker-ce
+  - docker-ce-cli-20.10.2
+  - docker-ce-20.10.2
   - openssl
 
+docker_packages:
+  - docker-ce-cli-20.10.2
+  - docker-ce-20.10.2
+
 custom_fact_dir: /etc/ansible/facts.d
 
 custom_fact_dir_mode: 0755
@@ -52,7 +57,7 @@ delay_count_one: "60"
 retry_count: "6"
 delay_count: "10"
 
-ntp_servers: 
+ntp_servers:
   - 0.centos.pool.ntp.org
   - 1.centos.pool.ntp.org
   - 2.centos.pool.ntp.org

+ 7 - 0
roles/slurm_start_services/tasks/main.yml

@@ -39,6 +39,13 @@
     enabled: yes
   tags: install
 
+- name: check slurmdbd is active
+  systemd:
+    name: slurmdbd
+  register: slurmdbd_status
+  until: 'slurmdbd_status.status.ActiveState=="active"'
+  retries: 20
+
 - name: Show cluster if exists
   command: sacctmgr -n show cluster {{ cluster_name }}
   register: slurm_clusterlist