C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This feature was removed by PR#3061. But change flag manage_docker to deploy_container_engine.
This commit is contained in:
okamototk 2018-11-27 00:26:40 +09:00 committed by k8s-ci-robot
parent a585318b1a
commit 967a042321
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster.yml
View file

@ -60,7 +60,7 @@
roles: roles:
- { role: kubespray-defaults} - { role: kubespray-defaults}
- { role: kubernetes/preinstall, tags: preinstall } - { 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: download, tags: download, when: "not skip_downloads" }
environment: "{{proxy_env}}" environment: "{{proxy_env}}"

4
inventory/sample/group_vars/all/all.yml
View file

@ -82,6 +82,10 @@ skip_non_kubeadm_warning: false
## Set true to download and cache container ## Set true to download and cache container
#download_container: true #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 ## Set Pypi repo and cert accordingly
#pyrepo_index: https://pypi.example.com/simple #pyrepo_index: https://pypi.example.com/simple
#pyrepo_cert: /etc/ssl/certs/ca-certificates.crt #pyrepo_cert: /etc/ssl/certs/ca-certificates.crt

2
roles/reset/tasks/main.yml
View file

@ -75,7 +75,7 @@
delay: 5 delay: 5
tags: tags:
- crio - crio
when: container_manager == 'crio' when: container_manager == 'crio' and deploy_container_engine|default(true)
- name: reset | gather mounted kubelet dirs - name: reset | gather mounted kubelet dirs
shell: mount | grep /var/lib/kubelet/ | awk '{print $3}' | tac shell: mount | grep /var/lib/kubelet/ | awk '{print $3}' | tac

2
scale.yml
View file

@ -62,7 +62,7 @@
roles: roles:
- { role: kubespray-defaults} - { role: kubespray-defaults}
- { role: kubernetes/preinstall, tags: preinstall } - { 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: download, tags: download, when: "not skip_downloads" }
- { role: etcd, tags: etcd, etcd_cluster_setup: false } - { role: etcd, tags: etcd, etcd_cluster_setup: false }
- { role: kubernetes/node, tags: node } - { role: kubernetes/node, tags: node }

2
upgrade-cluster.yml
View file

@ -61,7 +61,7 @@
roles: roles:
- { role: kubespray-defaults} - { role: kubespray-defaults}
- { role: kubernetes/preinstall, tags: preinstall } - { 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: download, tags: download, when: "not skip_downloads" }
environment: "{{proxy_env}}" environment: "{{proxy_env}}"