From a2090f2ab6328c135404cda31f86989457d7633e Mon Sep 17 00:00:00 2001 From: Luuk van Venrooij Date: Sun, 8 Mar 2020 17:58:24 +0100 Subject: [PATCH] Reverse merge: - Add ServerAliveInterval option to keep SSH connection for long running tasks #839 - Fix for 'Create epirepo repository' task waits for user input #967 --- core/src/epicli/data/common/ansible/ansible_inventory.j2 | 6 +++++- .../common/ansible/playbooks/roles/common/tasks/main.yml | 8 ++------ .../repository/files/server/Debian/create-repository.sh | 9 +++++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/core/src/epicli/data/common/ansible/ansible_inventory.j2 b/core/src/epicli/data/common/ansible/ansible_inventory.j2 index 16e1d9042a..18dd4073e4 100644 --- a/core/src/epicli/data/common/ansible/ansible_inventory.j2 +++ b/core/src/epicli/data/common/ansible/ansible_inventory.j2 @@ -16,5 +16,9 @@ [all:vars] ansible_user={{ cluster_model.specification.admin_user.name }} ansible_ssh_private_key_file={{ cluster_model.specification.admin_user.key_path }} -# todo: settings of StrictHostKeyChecking from epiphany configuration +# --- SSH options --- +# todo: manage StrictHostKeyChecking from Epiphany configuration +# Always appended to the default command line for sftp, scp, and ssh ansible_ssh_common_args='-o StrictHostKeyChecking=no' +# Always appended to the default ssh command line +ansible_ssh_extra_args='-o ServerAliveInterval=60 -o ServerAliveCountMax=1' diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/common/tasks/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/common/tasks/main.yml index a7cdcd7061..9ada4e8f30 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/common/tasks/main.yml +++ b/core/src/epicli/data/common/ansible/playbooks/roles/common/tasks/main.yml @@ -12,13 +12,9 @@ - include_tasks: firewall/configure-fw.yml tags: firewall -- name: Get environment variables - command: env - register: env_output - changed_when: false - - name: Print environment variables - debug: msg={{ env_output.stdout_lines }} + debug: + msg: "{{ ansible_env }}" - name: Adjust swappiness parameter sysctl: diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/server/Debian/create-repository.sh b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/server/Debian/create-repository.sh index 1d4c874627..98b88b8fa0 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/server/Debian/create-repository.sh +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/server/Debian/create-repository.sh @@ -27,8 +27,13 @@ if $IS_OFFLINE_MODE = true; then echo "updating apt..." apt -y update else - # for online mode just install apache - apt -y install apache2 dpkg-dev + # for online mode just install apache (force non-interactive mode, ref: https://bugs.launchpad.net/ubuntu/+source/ansible/+bug/1833013) + DEBIAN_FRONTEND=noninteractive \ + UCF_FORCE_CONFOLD=1 \ + apt-get \ + -o Dpkg::Options::=--force-confold \ + -o Dpkg::Options::=--force-confdef \ + -y -q install apache2 dpkg-dev # -m is important because it allow same packages with different versions # 'cd' is needed here becuase 'dpkg-scanpackages' prepends path to "Filename" field in Packages.gz