summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible.cfg2
-rw-r--r--chaos-at-home/host_vars/mimas2.yml18
-rw-r--r--roles/cloud-install/tasks/install_hcloud.yml2
-rw-r--r--roles/cloud-install/tasks/install_hroot.yml2
-rw-r--r--roles/cloud-install/tasks/main.yml4
-rw-r--r--roles/cloud-install/templates/hetzner_postinst.sh.j22
6 files changed, 14 insertions, 16 deletions
diff --git a/ansible.cfg b/ansible.cfg
index 001e7cbe..97646bde 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -22,7 +22,7 @@ var_compression_level = 9
bin_ansible_callbacks = True
-interpreter_python = auto
+interpreter_python = auto_silent
[ssh_connection]
pipelining = True
diff --git a/chaos-at-home/host_vars/mimas2.yml b/chaos-at-home/host_vars/mimas2.yml
index d0a9a782..08e7793e 100644
--- a/chaos-at-home/host_vars/mimas2.yml
+++ b/chaos-at-home/host_vars/mimas2.yml
@@ -1,10 +1,10 @@
$ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-62306466306134666137366136316236626665313339613732376234346561383936363637636230
-3433383630616330653831643264623361643562383831650a333739333231326264383661613339
-64356463306263656263356438346132613438326635643936333039353836383538343331346637
-3633343931646331340a333738313261386130343266373735373461396466653236653130666536
-32303236346637303563623935373030376536666661363465623839613336356635623861376638
-35636563646266633863336263316633643662653961363632393866633137353236636234623463
-37313537613938363631333338646565376132626461666666653265343831383565663163343236
-30383165333961643366373334643432356435646432333338616362353139646639313034656433
-3261
+65316635306432313731613863383365656239313833326239383466303939666338633436646139
+3138633330343837633666326633623035306563333637630a633965373238326661346363323334
+35343462326434346431623863363031363633646366306565376639393031393466393164613766
+3539303037616664370a323136633631666438393933376437666165626632373031323264656437
+64323931663331323430306464373139393164326362323037376334623438326361643834306438
+64633864323765356330653836636234666661366462636331653664373266366366303761336562
+61343465333662353165373737383566393637393364383564343262366630636661666234376466
+36626434333835643538616536613232336631613161313332616632373531386162366666353230
+3665
diff --git a/roles/cloud-install/tasks/install_hcloud.yml b/roles/cloud-install/tasks/install_hcloud.yml
index a4c61c0f..455d832e 100644
--- a/roles/cloud-install/tasks/install_hcloud.yml
+++ b/roles/cloud-install/tasks/install_hcloud.yml
@@ -22,7 +22,7 @@
- name: do not continue in check mode
fail:
msg: "can not bootstrap new servers in check mode"
- when: ansible_check_mode
+ when: ansible_check_mode | bool
check_mode: no
### TODO: for now we add all ssh keys that are installed for this project - this might not be a good idea!
diff --git a/roles/cloud-install/tasks/install_hroot.yml b/roles/cloud-install/tasks/install_hroot.yml
index 6d4d6017..1a8aeeaf 100644
--- a/roles/cloud-install/tasks/install_hroot.yml
+++ b/roles/cloud-install/tasks/install_hroot.yml
@@ -14,7 +14,7 @@
- name: do not continue in check mode
fail:
msg: "can not bootstrap new servers in check mode"
- when: ansible_check_mode
+ when: ansible_check_mode | bool
check_mode: no
- block:
diff --git a/roles/cloud-install/tasks/main.yml b/roles/cloud-install/tasks/main.yml
index ef6d42ae..94265382 100644
--- a/roles/cloud-install/tasks/main.yml
+++ b/roles/cloud-install/tasks/main.yml
@@ -1,6 +1,5 @@
---
- include_tasks: "{{ item }}"
- static: no
with_first_found:
- files:
- "install_{{ cloud_provider }}.yml"
@@ -9,8 +8,7 @@
setup:
- include_tasks: "{{ item }}"
- static: no
with_first_found:
- files:
- "post_{{ cloud_provider }}.yml"
- skip: True
+ skip: true
diff --git a/roles/cloud-install/templates/hetzner_postinst.sh.j2 b/roles/cloud-install/templates/hetzner_postinst.sh.j2
index 2835b477..0061677d 100644
--- a/roles/cloud-install/templates/hetzner_postinst.sh.j2
+++ b/roles/cloud-install/templates/hetzner_postinst.sh.j2
@@ -4,7 +4,7 @@ set -euf -o pipefail
export DEBIAN_FRONTEND=noninteractive
apt-get update -q
apt-get full-upgrade -y -q
-apt-get install -y -q --no-install-recommends openssh-server python
+apt-get install -y -q --no-install-recommends openssh-server python python-apt
passwd -d root && passwd -l root
{% if install_distro == "debian" %}