[Multiple Hardwares] [Installation] Check if resource matches layout.…

…yaml (#5181)

* zhiyuhe/1216

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

fix

* fix

* fix

contrib/kubespray/config/config.yaml

@@ -28,16 +28,10 @@ docker_image_tag: v1.5.0
 
 ###########################################################################################
 #                         Pre-check setting                                               #
-# By default, we assume your gpu environment is nvidia. So your runtime should be nvidia. #
-# If you are using AMD or other environment, you should modify it.                        #
 ###########################################################################################
-# worker_default_docker_runtime: nvidia
 # docker_check: true
-
 # resource_check: true
 
-# gpu_type: nvidia
-
 ########################################################################################
 # Advanced docker configuration. If you are not familiar with them, don't change them. #
 ########################################################################################

contrib/kubespray/config/layout.yaml

@@ -4,15 +4,18 @@
 machine-sku:
   master-machine: # define a machine sku
     # the resource requirements for all the machines of this sku
-    mem: 60GB
+    # We use the same memory format as Kubernetes, e.g. Gi, Mi
+    # Reference: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory
+    mem: 60Gi
     cpu:
+      # the number of CPU vcores
       vcore: 24
   gpu-machine:
     computing-device:
       type: nvidia.com/gpu
       model: K80
       count: 4
-    mem: 220GB
+    mem: 220Gi
     cpu:
       vcore: 24
 

contrib/kubespray/environment-check.yml

@@ -43,6 +43,32 @@
   roles:
     - { role: requirement/worker }
 
+# basic-resource role checks whether the host's basic resource meets the user input in layout.yaml
+# For now, we only check CPU and memory in this role. 
+- hosts: all
+  become: true
+  become_user: root
+  gather_facts: true
+  roles:
+    - { role: requirement/basic-resource }
+
+# In the following, we do different checks according to different kinds of computing device.
+# To add a new kind of computing device, please add it as an ansible role in "requirement/computing-devices",
+# and include the role here.
+- hosts: "nvidia.com/gpu"
+  become: true
+  become_user: root
+  gather_facts: true
+  roles:
+    - { role: requirement/computing-devices/nvidia.com_gpu }
+
+- hosts: "amd.com/gpu"
+  become: true
+  become_user: root
+  gather_facts: true
+  roles:
+    - { role: requirement/computing-devices/amd.com_gpu }
+
 - hosts: all,localhost
   tasks:
     - name: "display unmet requirements"