From 7a03b70c783828c7c17b4019c2cda295d31cf43f Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 27 Apr 2017 09:15:40 +0800 Subject: Revert "Merge workspace files into one folder" This reverts commit e6da6749be6e5143855a48c866de2cd03789d2e8. Change-Id: Ieac19a1526e7a5515923b8258079af3a1faaa56b Signed-off-by: Yujun Zhang --- .../qtip-workspace/files/defaults/templates/hosts | 20 ++++++++++++++++++++ .../qtip-workspace/files/defaults/templates/ssh.cfg | 14 ++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts create mode 100644 resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg (limited to 'resources/ansible_roles/qtip-workspace/files/defaults/templates') diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts new file mode 100644 index 00000000..6779d6f4 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts @@ -0,0 +1,20 @@ +localhost ansible_connection=local + +[{{ installer_master_group[installer] }}] +{{ installer_master_host }} + +[fuel-groups:children] +{% for group in hosts|sort %} +{{ group }} +{% endfor %} + +[fuel-groups:vars] +ansible_ssh_common_args=-F ./ssh.cfg + +{% for group in hosts|sort %} +[{{ group }}] +{% for host in hosts[group]|sort %} +{{ host }} +{% endfor %} + +{% endfor %} diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg new file mode 100644 index 00000000..6c8968d3 --- /dev/null +++ b/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg @@ -0,0 +1,14 @@ +# Connect to target node through jump host +# +# OpenSSH 7.3: +# ProxyJump jumphost +# before OpenSSH 7.3 +# ProxyCommand ssh -o 'ForwardAgent yes' jumphost 'ssh-add && nc %h %p' + +{% for (name, host) in hosts_meta.items() %} +Host {{ name }} + HostName {{ host.ansible_ssh_host }} + User root + ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p' + +{% endfor %} -- cgit 1.2.3-korg