Merge workspace template into one directory

Change-Id: I384ea3611e58feb7292840d672094d49bb9e7482
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

2 files changed, 0 insertions, 34 deletions

diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts b/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
deleted file mode 100644
index 6779d6f4..00000000
--- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 6c8968d3..00000000
--- a/resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg
+++ /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' {{ installer_master_host }} 'ssh-add && nc %h %p'
-
-{% endfor %}