From 34f9d51178f4cd37a7df1bb74897dff7eb5c065f Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 14 Jun 2019 17:31:39 -0400 Subject: [PATCH] tests: Update ansible ssh_args variable Because we're using vagrant, a ssh config file will be created for each nodes with options like user, host, port, identity, etc... But via tox we're override ANSIBLE_SSH_ARGS to use this file. This remove the default value set in ansible.cfg. Also adding PreferredAuthentications=publickey because CentOS/RHEL servers are configured with GSSAPIAuthenticationis enabled for ssh server forcing the client to make a PTR DNS query. Signed-off-by: Dimitri Savineau --- ansible.cfg | 2 +- .../tasks/create_ceph_initial_dirs.yml | 36 +++++++++---------- tox-dashboard.ini | 2 +- tox-podman.ini | 2 +- tox-update.ini | 2 +- tox.ini | 6 ++-- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index 82678520c..1773833a4 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -31,7 +31,7 @@ timeout = 60 [ssh_connection] # see: https://github.com/ansible/ansible/issues/11536 control_path = %(directory)s/%%h-%%r-%%p -ssh_args = -o ControlMaster=auto -o ControlPersist=600s +ssh_args = -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey pipelining = True # Option to retry failed ssh executions if the failure is encountered in ssh itself diff --git a/roles/ceph-config/tasks/create_ceph_initial_dirs.yml b/roles/ceph-config/tasks/create_ceph_initial_dirs.yml index b7c9a0848..a7f1325c8 100644 --- a/roles/ceph-config/tasks/create_ceph_initial_dirs.yml +++ b/roles/ceph-config/tasks/create_ceph_initial_dirs.yml @@ -1,23 +1,4 @@ --- -- name: set_fact ceph_directories - set_fact: - ceph_directories: - - /etc/ceph - - /var/lib/ceph/ - - /var/lib/ceph/mon - - /var/lib/ceph/osd - - /var/lib/ceph/mds - - /var/lib/ceph/tmp - - /var/lib/ceph/radosgw - - /var/lib/ceph/bootstrap-rgw - - /var/lib/ceph/bootstrap-mgr - - /var/lib/ceph/bootstrap-mds - - /var/lib/ceph/bootstrap-osd - - /var/lib/ceph/bootstrap-rbd - - /var/lib/ceph/bootstrap-rbd-mirror - - /var/run/ceph - - /var/log/ceph - - name: create ceph initial directories file: path: "{{ item }}" @@ -25,4 +6,19 @@ owner: "{{ ceph_uid }}" group: "{{ ceph_uid }}" mode: 0755 - with_items: "{{ ceph_directories }}" + loop: + - /etc/ceph + - /var/lib/ceph/ + - /var/lib/ceph/mon + - /var/lib/ceph/osd + - /var/lib/ceph/mds + - /var/lib/ceph/tmp + - /var/lib/ceph/radosgw + - /var/lib/ceph/bootstrap-rgw + - /var/lib/ceph/bootstrap-mgr + - /var/lib/ceph/bootstrap-mds + - /var/lib/ceph/bootstrap-osd + - /var/lib/ceph/bootstrap-rbd + - /var/lib/ceph/bootstrap-rbd-mirror + - /var/run/ceph + - /var/log/ceph diff --git a/tox-dashboard.ini b/tox-dashboard.ini index 29cb7b51f..f8bdf4fb9 100644 --- a/tox-dashboard.ini +++ b/tox-dashboard.ini @@ -12,7 +12,7 @@ whitelist_externals = pip passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback diff --git a/tox-podman.ini b/tox-podman.ini index f764fa3e2..f8c8ef34e 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -13,7 +13,7 @@ whitelist_externals = passenv=* sitepackages=True setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback diff --git a/tox-update.ini b/tox-update.ini index b3bf7e762..6c64531fe 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -11,7 +11,7 @@ whitelist_externals = pip passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback diff --git a/tox.ini b/tox.ini index 7a7a9188b..c6b2ac99e 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ whitelist_externals = pip passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback @@ -86,7 +86,7 @@ whitelist_externals = cat passenv=* setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback @@ -330,7 +330,7 @@ whitelist_externals = passenv=* sitepackages=True setenv= - ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback -- 2.39.5