diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 19:29:36 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 19:29:36 +0800 |
commit | e6da6749be6e5143855a48c866de2cd03789d2e8 (patch) | |
tree | f14eddfc936af6b4c4c92d59b9e6d8fc4083756e /resources/ansible_roles/qtip-workspace/files/defaults/templates | |
parent | 6827bf2d62ac0935369a86b87782f404ac413570 (diff) |
Merge workspace files into one folder
Change-Id: Ie8d0e8fdd6d6c212701ba1ee10b1d05da1ccca22
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles/qtip-workspace/files/defaults/templates')
-rw-r--r-- | resources/ansible_roles/qtip-workspace/files/defaults/templates/hosts | 20 | ||||
-rw-r--r-- | resources/ansible_roles/qtip-workspace/files/defaults/templates/ssh.cfg | 14 |
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 %} |