Reverse merge for v0.4 branch

CHANGELOG-0.4.md

@@ -1,5 +1,12 @@
 # Changelog 0.4
 
+## [0.4.3] 2020-03-xx
+
+### Fixed
+
+- [#966](https://github.com/epiphany-platform/epiphany/issues/966) - Ubuntu builds get stuck on task [repository : Create epirepo repository] waiting for user input
+- [#839](https://github.com/epiphany-platform/epiphany/issues/839) - Add ServerAliveInterval option to keep SSH connection for long running tasks
+
 ## [0.4.2] 2019-11-20
 
 ### Added

CHANGELOG.md

@@ -11,6 +11,9 @@ Reference for actual cluster component versions can be found [here](docs/home/CO
 
 ### 0.4.x
 
+- [CHANGELOG-0.4.3](./CHANGELOG-0.4.md#043-2020-03-xx)
+- [CHANGELOG-0.4.2](./CHANGELOG-0.4.md#042-2019-11-20)
+- [CHANGELOG-0.4.1](./CHANGELOG-0.4.md#041-2019-10-17)
 - [CHANGELOG-0.4.0](./CHANGELOG-0.4.md#040-2019-09-30)
 
 ## Older releases

core/src/epicli/cli/version.txt.py

@@ -1 +1 @@
-0.4.2
+0.4.3

core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml

@@ -12,7 +12,7 @@ specification:
   authorized_to_efs: false
   mount_efs: false
   tags:
-    - version: 0.4.2
+    - version: 0.4.3
   size: t2.micro
   os_full_name: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20190212.1"
   os_type: linux
@@ -88,7 +88,7 @@ provider: aws
 name: default-size-t3
 specification:
   tags:
-    - version: 0.4.2
+    - version: 0.4.3
   size: t3.micro
   os_type: linux
   security:
@@ -120,7 +120,7 @@ provider: aws
 name: rabbitmq-machine
 specification:
   tags:
-    - version: 0.4.2
+    - version: 0.4.3
   size: t3.micro
   os_type: linux
   security:
@@ -192,7 +192,7 @@ provider: aws
 name: load-balancer-machine
 specification:
   tags:
-    - version: 0.4.2
+    - version: 0.4.3
   size: t3.micro
   os_type: linux
   security:

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'

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:

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

core/src/epicli/data/common/validation/core/definitions.yml

@@ -24,9 +24,9 @@ provider:
 version:
   type: string
   title: The Version Schema
-  default: '0.4.2'
+  default: '0.4.3'
   examples:
-  - 0.4.2
+  - 0.4.3
   pattern: ^((\d+\.)(\d+\.)(\d))$
 unvalidated_specification:
   type: