epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-08 02:58:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Automatically infer bootstrap_os (#3498)

Browse Source 
* Automatically infer bootstrap_os

* Rename bootstrap os to os_family
This commit is contained in:
Giacomo Longo
2018-10-11 08:32:10 +02:00
committed by k8s-ci-robot
parent e813b26963
commit 3f786542d3
22 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -1,8 +1,4 @@
---
## Required for bootstrap-os/preinstall/download roles and setting facts
# Valid bootstrap options (required): ubuntu, coreos, centos, none
bootstrap_os: none
# Use proxycommand if bastion host is in group all
# This change obseletes editing ansible.cfg file depending on bastion existance
ansible_ssh_common_args: "{% if 'bastion' in groups['all'] %} -o ProxyCommand='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -W %h:%p {{ hostvars['bastion']['ansible_user'] }}@{{ hostvars['bastion']['ansible_host'] }} {% if ansible_ssh_private_key_file is defined %}-i {{ ansible_ssh_private_key_file }}{% endif %} ' {% endif %}"