From 94eb18b3d9466b140fde75bd7810124e89dc98fd Mon Sep 17 00:00:00 2001 From: Vikas Kumar Date: Tue, 27 Feb 2018 01:12:03 +1100 Subject: [PATCH] Replaced ansible_ssh_host with ansible_host in sample inventory file as the former is deprecated since Ansible v2.0 Fixed the reference of ansible_user in kubespray-defaults role References: - http://docs.ansible.com/ansible/latest/intro_inventory.html --- inventory/sample/hosts.ini | 14 +++++++------- roles/kubespray-defaults/defaults/main.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/sample/hosts.ini b/inventory/sample/hosts.ini index 245783334..bddfa2f80 100644 --- a/inventory/sample/hosts.ini +++ b/inventory/sample/hosts.ini @@ -1,14 +1,14 @@ # ## Configure 'ip' variable to bind kubernetes services on a # ## different ip than the default iface -# node1 ansible_ssh_host=95.54.0.12 # ip=10.3.0.1 -# node2 ansible_ssh_host=95.54.0.13 # ip=10.3.0.2 -# node3 ansible_ssh_host=95.54.0.14 # ip=10.3.0.3 -# node4 ansible_ssh_host=95.54.0.15 # ip=10.3.0.4 -# node5 ansible_ssh_host=95.54.0.16 # ip=10.3.0.5 -# node6 ansible_ssh_host=95.54.0.17 # ip=10.3.0.6 +# node1 ansible_host=95.54.0.12 # ip=10.3.0.1 +# node2 ansible_host=95.54.0.13 # ip=10.3.0.2 +# node3 ansible_host=95.54.0.14 # ip=10.3.0.3 +# node4 ansible_host=95.54.0.15 # ip=10.3.0.4 +# node5 ansible_host=95.54.0.16 # ip=10.3.0.5 +# node6 ansible_host=95.54.0.17 # ip=10.3.0.6 # ## configure a bastion host if your nodes are not directly reachable -# bastion ansible_ssh_host=x.x.x.x +# bastion ansible_host=x.x.x.x ansible_user=some_user # [kube-master] # node1 diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index d6217d654..cb845a067 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -5,7 +5,7 @@ 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 {{ ansible_user }}@{{hostvars['bastion']['ansible_host']}} {% if ansible_ssh_private_key_file is defined %}-i {{ ansible_ssh_private_key_file }}{% endif %} ' {% endif %}" +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 %}" kube_api_anonymous_auth: false