From 8e0b0132a11dc94415054793d7b74215a75ac2d8 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 24 May 2017 19:57:27 +0800 Subject: Add support for create new project from different templates Change-Id: Ic260c59b12eb9882406d6172311f2e401963c64b Signed-off-by: Yujun Zhang --- .../qtip-workspace/files/template/templates/hosts | 25 ---------------------- .../files/template/templates/ssh.cfg | 16 -------------- 2 files changed, 41 deletions(-) delete mode 100644 resources/ansible_roles/qtip-workspace/files/template/templates/hosts delete mode 100644 resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg (limited to 'resources/ansible_roles/qtip-workspace/files/template/templates') diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts b/resources/ansible_roles/qtip-workspace/files/template/templates/hosts deleted file mode 100644 index 34e4aa92..00000000 --- a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts +++ /dev/null @@ -1,25 +0,0 @@ -{% raw %} -localhost ansible_connection=local - -[{{ installer_master_group[installer] }}] -{{ installer_master_host }} - -[SUT:children] # system under test -compute - -[node-groups:children] -{% for group in hosts|sort %} -{{ group }} -{% endfor %} - -[node-groups:vars] -ansible_ssh_common_args=-F ./ssh.cfg - -{% for group in hosts|sort %} -[{{ group }}] -{% for host in hosts[group]|sort %} -{{ host }} -{% endfor %} - -{% endfor %} -{% endraw %} diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg b/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg deleted file mode 100644 index 67246054..00000000 --- a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg +++ /dev/null @@ -1,16 +0,0 @@ -{% raw %} -# 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 %} -{% endraw %} \ No newline at end of file -- cgit 1.2.3-korg