Add flag to deploy container engine manually. (kubernetes-sigs#3753)

This feature was removed by PR#3061. But change flag manage_docker to deploy_container_engine.
lucas-cegatti · Nov 26, 2018 · 967a042 · 967a042
1 parent a585318
commit 967a042
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/cluster.yml b/cluster.yml
@@ -60,7 +60,7 @@
   roles:
     - { role: kubespray-defaults}
     - { role: kubernetes/preinstall, tags: preinstall }
-    - { role: "container-engine", tags: "container-engine" }
+    - { role: "container-engine", tags: "container-engine", when: deploy_container_engine|default(true) }
     - { role: download, tags: download, when: "not skip_downloads" }
   environment: "{{proxy_env}}"
 

diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml
@@ -82,6 +82,10 @@ skip_non_kubeadm_warning: false
 ## Set true to download and cache container
 #download_container: true
 
+## Deploy container engine
+# Set false if you want to deploy container engine manually.
+#deploy_container_engine: true
+
 ## Set Pypi repo and cert accordingly
 #pyrepo_index: https://pypi.example.com/simple
 #pyrepo_cert: /etc/ssl/certs/ca-certificates.crt
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
@@ -75,7 +75,7 @@
   delay: 5
   tags:
     - crio
-  when: container_manager == 'crio'
+  when: container_manager == 'crio' and deploy_container_engine|default(true)
 
 - name: reset | gather mounted kubelet dirs
   shell: mount | grep /var/lib/kubelet/ | awk '{print $3}' | tac

diff --git a/scale.yml b/scale.yml
@@ -62,7 +62,7 @@
   roles:
     - { role: kubespray-defaults}
     - { role: kubernetes/preinstall, tags: preinstall }
-    - { role: container-engine, tags: "container-engine"}
+    - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
     - { role: download, tags: download, when: "not skip_downloads" }
     - { role: etcd, tags: etcd, etcd_cluster_setup: false }
     - { role: kubernetes/node, tags: node }

diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
@@ -61,7 +61,7 @@
   roles:
     - { role: kubespray-defaults}
     - { role: kubernetes/preinstall, tags: preinstall }
-    - { role: container-engine, tags: "container-engine"}
+    - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
     - { role: download, tags: download, when: "not skip_downloads" }
   environment: "{{proxy_env}}"