From 18374fba1dfff08916bf84ee749b89d1b1e55cde Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 28 Jul 2017 13:06:01 +0100 Subject: [PATCH] tests: bootstrap-aio: Add sftp subsystem option for SUSE Convert the existing sftp variable into a dictionary so it can contain the correct sftp path for SUSE hosts. Change-Id: Ie5ade74f9fc5a6fa8eef4af35b269d87125674d6 --- tests/bootstrap-aio.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/bootstrap-aio.yml b/tests/bootstrap-aio.yml index bf3427151b..1e7d267e29 100644 --- a/tests/bootstrap-aio.yml +++ b/tests/bootstrap-aio.yml @@ -69,9 +69,11 @@ - name: keystone.yml.aio - name: heat.yml.aio - name: tacker.yml.aio - pip_install_upper_constraints_proto: "{{ ansible_python_version | version_compare('2.7.9', '>=') | ternary('https','http') }}" - sftp_subsystem: "{{ (ansible_pkg_mgr == 'apt') | ternary('sftp /usr/lib/openssh/sftp-server','sftp /usr/libexec/openssh/sftp-server') }}" + sftp_subsystem: + 'apt': 'sftp /usr/lib/openssh/sftp-server' + 'yum': 'sftp /usr/libexec/openssh/sftp-server' + 'zypper': 'sftp /usr/lib/ssh/sftp-server' sshd: ListenAddress: - 0.0.0.0 @@ -103,7 +105,7 @@ PrintLastLog: no TCPKeepAlive: yes AcceptEnv: "LANG LC_*" - Subsystem: "{{ sftp_subsystem }}" + Subsystem: "{{ sftp_subsystem[ansible_pkg_mgr] }}" UsePAM: yes UseDNS: no X11Forwarding: no