From 3e60f55b5446a6a4c4a09a025fb331ffe0297944 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 6 Jul 2021 16:43:41 +0200
Subject: [PATCH] use new disk image template that has haveged pre-installed

---
 .gitlab/ci_scripts/create_vps.sh           |  2 +-
 ansible/roles/pre-configure/tasks/main.yml | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.gitlab/ci_scripts/create_vps.sh b/.gitlab/ci_scripts/create_vps.sh
index 5de2a709b..5164852df 100644
--- a/.gitlab/ci_scripts/create_vps.sh
+++ b/.gitlab/ci_scripts/create_vps.sh
@@ -16,7 +16,7 @@ python3 -m openappstack $HOSTNAME create \
   --ssh-key-id $SSH_KEY_ID \
   --create-domain-records \
   --subdomain $SUBDOMAIN \
-  --disk-image-id '-7473' \
+  --disk-image-id '-8109' \
   --truncate-subdomain \
   --docker-mirror-server="${CI_DEPENDENCY_PROXY_SERVER}" \
   --docker-mirror-endpoint="${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}" \
diff --git a/ansible/roles/pre-configure/tasks/main.yml b/ansible/roles/pre-configure/tasks/main.yml
index 62a54f4f9..2ab83ed34 100644
--- a/ansible/roles/pre-configure/tasks/main.yml
+++ b/ansible/roles/pre-configure/tasks/main.yml
@@ -5,16 +5,6 @@
 - name: Configure journald
   import_tasks: journald.yml
 
-- name: Get running processes
-  shell: "ps aux"
-  failed_when: false
-  register: running_processes
-  changed_when: false
-
-- name: Show running processes
-  debug:
-    msg: 'Running processes: {{ running_processes.stdout }}'
-
 - name: Update apt packages cache and install needed packages
   # apt-transport-https is needed for docker apt repo
   # curl and git is needed for helm plugin install
@@ -31,6 +21,7 @@
       - nftables
       - rsync
       - snapd
+      - unattended-upgrades
     # Update again after 1 day
     cache_valid_time: 86400
     update_cache: yes
@@ -48,13 +39,6 @@
     - rsyslog
     - syslog-ng
 
-- name: Install unattended upgrades last
-  apt:
-    state: present
-    name:
-      - unattended-upgrades
-    update_cache: no
-
 - name: Install python deps
   tags:
     - package
-- 
GitLab