summaryrefslogtreecommitdiffstats
path: root/resources/roles/qtip-workspace/files/copy
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-21 09:59:27 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-21 13:43:50 +0800
commitb1683c050b3e603378c57a21a7851dac432111b7 (patch)
treea2d83e3fb63a7df3ce8bdc7600905fcf2f0de6b4 /resources/roles/qtip-workspace/files/copy
parent6144eac326d14e26bbb849abea51c4cf7f3881b6 (diff)
Cleanup customizable variables of workspace
Change-Id: I00185b7c73692e2aeafb1307cea81f4f2d149c74 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/roles/qtip-workspace/files/copy')
-rw-r--r--resources/roles/qtip-workspace/files/copy/templates/hosts2
-rw-r--r--resources/roles/qtip-workspace/files/copy/templates/ssh.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/roles/qtip-workspace/files/copy/templates/hosts b/resources/roles/qtip-workspace/files/copy/templates/hosts
index 27c8d1d6..6779d6f4 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/hosts
+++ b/resources/roles/qtip-workspace/files/copy/templates/hosts
@@ -1,7 +1,7 @@
localhost ansible_connection=local
[{{ installer_master_group[installer] }}]
-{{ installer_master }}
+{{ installer_master_host }}
[fuel-groups:children]
{% for group in hosts|sort %}
diff --git a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
index d6a266ba..6c8968d3 100644
--- a/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
+++ b/resources/roles/qtip-workspace/files/copy/templates/ssh.cfg
@@ -9,6 +9,6 @@
Host {{ name }}
HostName {{ host.ansible_ssh_host }}
User root
- ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master }} 'ssh-add && nc %h %p'
+ ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_master_host }} 'ssh-add && nc %h %p'
{% endfor %}