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

handle both 'ansible_host' and 'ansible_ssh_host' in bastion configuration

Browse source 
'absible_ssh_host' is deprecated in Ansible 2.0 and at least
'contrib/inventory_builder/inventory.py' uses 'ansible_host' instead.
This commit is contained in:
Vladimir Rutsky 2017-02-02 18:33:05 +03:00
parent 776e48e898
commit 1711530cd4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/bastion-ssh-config/templates/ssh-bastion.conf
View file

@ -4,7 +4,7 @@
{% for h in groups['all'] %} {% for h in groups['all'] %}
{% if h != 'bastion' %} {% if h != 'bastion' %}
{% if vars.update({'hosts': vars['hosts'] + ' ' + hostvars[h]['ansible_ssh_host']}) %}{% endif %} {% if vars.update({'hosts': vars['hosts'] + ' ' + (hostvars[h].get('ansible_ssh_host') or hostvars[h]['ansible_host'])}) %}{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -18,4 +18,4 @@ Host {{ bastion_ip }}
Host {{ vars['hosts'] }} Host {{ vars['hosts'] }}
ProxyCommand ssh -W %h:%p {{ real_user }}@{{ bastion_ip }} ProxyCommand ssh -W %h:%p {{ real_user }}@{{ bastion_ip }}
StrictHostKeyChecking no StrictHostKeyChecking no
{% endif %} {% endif %}