diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-01-15 01:34:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-15 01:34:19 +0000 |
| commit | cd43e1188a918cbf94738c08012a21152bd535d2 (patch) | |
| tree | ed64a1d31a668583a0bed8324925e1da0cf1c03d | |
| parent | a9130ff7b0593a2e4d6fe3c84d44892b1c0a3340 (diff) | |
| parent | 8cc5df6f9e3222b827397367840fa6423130bb80 (diff) | |
Merge "Add a judgement to control the proxy jump configuration"
| -rw-r--r-- | qtip/ansible_library/modules/mcp.py | 2 | ||||
| -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 |
3 files changed, 13 insertions, 1 deletions
diff --git a/qtip/ansible_library/modules/mcp.py b/qtip/ansible_library/modules/mcp.py index 97ead724..43075fcd 100644 --- a/qtip/ansible_library/modules/mcp.py +++ b/qtip/ansible_library/modules/mcp.py @@ -80,7 +80,7 @@ def generate_inventory(nodes): } hosts['compute'].append(value['host']) - return {'hosts': hosts, 'hosts_meta': hosts_meta} + return {'hosts': hosts, 'hosts_meta': hosts_meta, 'proxy_jump': False} def main(): 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 |