Merge pull request #12723 from VannTen/molecule_var_in_inventory

Put molecule variables in molecule inventories

roles/container-engine/cri-dockerd/molecule/default/molecule.yml

@@ -25,6 +25,8 @@ provisioner:
     group_vars:
       all:
         become: true
+      k8s_cluster:
+        container_manager: docker
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

roles/container-engine/cri-o/molecule/default/converge.yml

@@ -2,8 +2,6 @@
 - name: Converge
   hosts: all
   become: true
-  vars:
-    container_manager: crio
   roles:
     - role: kubespray_defaults
     - role: container-engine/cri-o

roles/container-engine/cri-o/molecule/default/molecule.yml

@@ -41,6 +41,10 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        container_manager: crio
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

roles/container-engine/cri-o/molecule/default/verify.yml

@@ -2,7 +2,6 @@
 - name: Test CRI-O cri
   import_playbook: ../../../molecule/test_cri.yml
   vars:
-    container_manager: crio
     cri_socket: unix:///var/run/crio/crio.sock
     cri_name: cri-o
 - name: Test running a container with crun

roles/container-engine/gvisor/molecule/default/molecule.yml

@@ -21,6 +21,11 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        gvisor_enabled: true
+        container_manager: containerd
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

roles/container-engine/youki/molecule/default/molecule.yml

@@ -21,6 +21,11 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        youki_enabled: true
+        container_manager: crio
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml