diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2017-12-19 17:26:29 +0800 |
|---|---|---|
| committer | zhihui wu <wu.zhihui1@zte.com.cn> | 2018-01-09 17:07:47 +0800 |
| commit | 8cc5df6f9e3222b827397367840fa6423130bb80 (patch) | |
| tree | a3fe661f1436f927778384a07d07becc8112fdb5 /resources | |
| parent | 0436f87ff05b0835e1ed75ee2955f5097e572224 (diff) | |
Add a judgement to control the proxy jump configuration
- Set a default value(True) to proxy_jump
- For MCP, set proxy_jump to False. Because remote node can
be directly connected from qtip container without proxy jump.
Change-Id: I92214de984a0231ba4ba873f3a60cb12589ade28
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg | 2 | ||||
| -rwxr-xr-x | resources/ansible_roles/qtip/defaults/main.yml | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg index 1b7c0183..94acd778 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg +++ b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg @@ -10,7 +10,9 @@ Host {{ name }} HostName {{ host.ansible_ssh_host }} User {{ host.ansible_user }} +{% if proxy_jump %} ProxyCommand ssh -o 'ForwardAgent yes' {{ installer_host }} 'ssh-add && nc %h %p' +{% endif %} {% endfor %} {% endraw %}
\ No newline at end of file diff --git a/resources/ansible_roles/qtip/defaults/main.yml b/resources/ansible_roles/qtip/defaults/main.yml new file mode 100755 index 00000000..2569059c --- /dev/null +++ b/resources/ansible_roles/qtip/defaults/main.yml @@ -0,0 +1,10 @@ +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +proxy_jump: True |