summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-prometheus.yml8
-rw-r--r--inventory/group_vars/all/main.yml1
-rw-r--r--inventory/host_vars/ch-prometheus.yml4
-rw-r--r--roles/core/sshd/tasks/main.yml2
4 files changed, 14 insertions, 1 deletions
diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index 1cfa59c1..4ecc415e 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -39,3 +39,11 @@
sleep 2
systemctl restart libvirtd.service
systemctl restart nfs-kernel-server
+
+ - name: install dstat script
+ copy:
+ dest: /usr/local/bin/dstat.sh
+ mode: 0755
+ content: |
+ #!/bin/bash
+ exec dstat -cnd -N enp1s0,bond0 -D nvme0n1,nvme1n1,sda,sdb,sdc --disk-util --top-io --top-bio
diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml
index afec7b49..accb807e 100644
--- a/inventory/group_vars/all/main.yml
+++ b/inventory/group_vars/all/main.yml
@@ -10,6 +10,7 @@ global_files_dir: "{{ inventory_dir }}/../files"
ssh_users_root:
- equinox
ssh_keys_root: "{{ ssh_users_root | default([]) | map('extract', users) | map(attribute='ssh') | flatten | list }}"
+ssh_keys_root_extra: []
admin_users_host: []
sshd_allowusers_host: "{{ admin_users_host }}"
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index b79cc586..54190538 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -40,6 +40,10 @@ apt_repo_components:
- non-free ## for microcode updates
+ssh_keys_root_extra:
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAw9/ofN1TOzfQNUw2WOLc1Zge0M3syzn9dzm9StkgxK root@prometheus
+ - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9AkOBxvf1wZ0B3wEyf7O3GbaIGx5o2f6cVuQIrOjeFfgMSAr1LwiB/gmHhMSEq6OSauD37TA5yDIrzk6NPPjVs/wiklsHgYtTqIxSPItTZFPX4gLvNwwGuRvEW9bTEiHd+bVPIiIT7HOje0kgacjan44rdgppX9DgcUp2j7uSZZabsxDCS/ms0slhwBNU1gtR31PoQ56vIya23D2uMauNAbRJzDEOfAjy4pHF8njYcXPas/yrbLi8PUZ1YO1u/AZto96EIYfHaCLWlstqeCX+R2JrTunvfTr8TF3AkFw8lHMzk3neUR+tPAAFQaqeTlqGPiSNq1Oyf+52XR16qwhd equinox@mail
+
installer_lvm:
vg: "{{ host_name }}"
lv: installer
diff --git a/roles/core/sshd/tasks/main.yml b/roles/core/sshd/tasks/main.yml
index f07bef54..88ecf64a 100644
--- a/roles/core/sshd/tasks/main.yml
+++ b/roles/core/sshd/tasks/main.yml
@@ -45,7 +45,7 @@
- name: install ssh keys for root
authorized_key:
user: root
- key: "{{ ssh_keys_root | join('\n') }}"
+ key: "{{ ssh_keys_root | union(ssh_keys_root_extra) | join('\n') }}"
exclusive: yes
- name: delete root password