container_manager variable to specify runtime.

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2

@@ -15,6 +15,6 @@ discoveryTokenAPIServers:
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
   name: {{ inventory_hostname  }}
-{% if manage_crio %}
+{% if container_manager == 'crio' %}
   criSocket: /var/run/crio/crio.sock
 {% endif %}

roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

@@ -138,6 +138,6 @@ nodeRegistration:
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master
-{% if manage_crio %}
+{% if container_manager == 'crio' %}
   criSocket: /var/run/crio/crio.sock
 {% endif %}

roles/kubernetes/node/templates/kubelet.kubeadm.env.j2

@@ -34,10 +34,10 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 --node-status-update-frequency={{ kubelet_status_update_frequency }} \
 --cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \
 --max-pods={{ kubelet_max_pods }} \
-{% if manage_docker %}
+{% if container_manager == 'docker' %}
 --docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \
 {% endif %}
-{% if manage_crio %}
+{% if container_manager == 'crio' %}
 --container-runtime=remote \
 --container-runtime-endpoint=/var/run/crio/crio.sock \
 {% endif %}

roles/kubernetes/node/templates/kubelet.standard.env.j2

@@ -15,7 +15,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 --cadvisor-port={{ kube_cadvisor_port }} \
 --pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
 --node-status-update-frequency={{ kubelet_status_update_frequency }} \
-{% if manage_docker %}
+{% if container_manager == 'docker' %}
 --docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \
 {% endif %}
 --client-ca-file={{ kube_cert_dir }}/ca.pem \
@@ -28,7 +28,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 {% if kube_version | version_compare('v1.7', '<') %}
 --enable-cri={{ kubelet_enable_cri }} \
 {% endif %}
-{% if manage_crio %}
+{% if container_manager == 'crio' %}
 --container-runtime=remote \
 --container-runtime-endpoint=/var/run/crio/crio.sock \
 {% endif %}

roles/kubespray-defaults/defaults/main.yaml

@@ -131,13 +131,8 @@ kube_apiserver_insecure_port: 8080
 # Aggregator
 kube_api_aggregator_routing: false
 
-# Docker options
-# Optionally do not run docker role
-manage_docker: true
-
-# cri-o options
-# Optionally run cri-o role
-manage_crio: false
+# Container for runtime
+container_manager: docker
 
 # Path used to store Docker data
 docker_daemon_graph: "/var/lib/docker"

roles/reset/tasks/main.yml

@@ -68,7 +68,7 @@
   delay: 5
   tags:
     - crio
-  when: manage_crio
+  when: container_manager == 'crio'
 
 - name: reset | gather mounted kubelet dirs
   shell: mount | grep /var/lib/kubelet/ | awk '{print $3}' | tac