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>

diff --git a/qtip/ansible_library/modules/mcp.py b/qtip/ansible_library/modules/mcp.py
index 97ead72..43075fc 100644 (file)
--- 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 1b7c018..94acd77 100644 (file)
--- 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 (executable)
index 0000000..2569059
--- /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