From a6d8313b300453c15e7c2438979db6253b6e6819 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 20 Apr 2017 18:08:42 +0800 Subject: Fix workspace creator - handle relative path in workspace - handle differences between installers - create working directories Change-Id: I5fbe66c1218c29db0fafd87085a6cf5c15a91dc5 Signed-off-by: Yujun Zhang --- resources/template/hosts.j2 | 18 ------------------ resources/template/ssh.cfg.j2 | 14 -------------- 2 files changed, 32 deletions(-) delete mode 100644 resources/template/hosts.j2 delete mode 100644 resources/template/ssh.cfg.j2 (limited to 'resources/template') diff --git a/resources/template/hosts.j2 b/resources/template/hosts.j2 deleted file mode 100644 index 2ebf3c8b..00000000 --- a/resources/template/hosts.j2 +++ /dev/null @@ -1,18 +0,0 @@ -fuel-master -localhost ansible_connection=local - -[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/template/ssh.cfg.j2 b/resources/template/ssh.cfg.j2 deleted file mode 100644 index 2fe049e2..00000000 --- a/resources/template/ssh.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# 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' fuel-master 'ssh-add && nc %h %p' - -{% endfor %} -- cgit