diff options
| -rw-r--r-- | dan/ele-dione.yml | 2 | ||||
| -rw-r--r-- | dan/ele-helene.yml | 2 | ||||
| -rw-r--r-- | dan/emc-dist.yml | 11 | ||||
| -rw-r--r-- | dan/emc-master.yml | 2 | ||||
| -rw-r--r-- | dan/emc-xx.yml | 1 | ||||
| -rw-r--r-- | dan/k8s-emc.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/emc-dist/vars.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/emc/vars.yml | 7 | ||||
| -rw-r--r-- | inventory/host_vars/ele-dione.yml | 5 | ||||
| -rw-r--r-- | inventory/host_vars/ele-helene.yml | 5 | ||||
| -rw-r--r-- | inventory/host_vars/ele-telesto.yml | 1 | ||||
| -rw-r--r-- | inventory/hosts.ini | 5 |
12 files changed, 44 insertions, 1 deletions
diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml index ca04c441..a7e47c2a 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-dione.yml @@ -9,4 +9,6 @@ - role: core/cpu-microcode - role: core/ntp - role: core/admin-users + - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter - role: streaming/blackmagic/desktopvideo diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index 172946f1..ac2305f3 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -9,6 +9,8 @@ - role: core/cpu-microcode - role: core/ntp - role: core/admin-users + - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter - role: streaming/blackmagic/desktopvideo post_tasks: ## this is needed for local rtmp proxy diff --git a/dan/emc-dist.yml b/dan/emc-dist.yml new file mode 100644 index 00000000..7c46b839 --- /dev/null +++ b/dan/emc-dist.yml @@ -0,0 +1,11 @@ +--- +- name: Basic Setup + hosts: "{{ install_hostname }}" + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter diff --git a/dan/emc-master.yml b/dan/emc-master.yml index 651b6bb3..118710a2 100644 --- a/dan/emc-master.yml +++ b/dan/emc-master.yml @@ -7,5 +7,7 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter - role: storage/lvm/groups - role: elevate/emc-stats diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml index 4519a7dc..59a98a9e 100644 --- a/dan/emc-xx.yml +++ b/dan/emc-xx.yml @@ -8,6 +8,7 @@ - role: core/zsh - role: core/ntp - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter - role: acmetool/base - role: acmetool/cert acmetool_cert_name: "{{ host_name }}.{{ host_domain }}" diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml index bccda74e..92cc909a 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -6,6 +6,8 @@ - role: core/base - role: core/sshd/base - role: core/zsh + - role: apt-repo/spreadspace + - role: monitoring/prometheus/exporter - import_playbook: ../common/kubernetes-cluster-layout.yml vars: diff --git a/inventory/group_vars/emc-dist/vars.yml b/inventory/group_vars/emc-dist/vars.yml new file mode 100644 index 00000000..be878b51 --- /dev/null +++ b/inventory/group_vars/emc-dist/vars.yml @@ -0,0 +1,2 @@ +--- +install_playbook: emc-dist diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index 2b37171f..d1912106 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -8,6 +8,13 @@ install: network: {} +prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" + +spreadspace_apt_repo_components: + - main + - prometheus + + containerd_storage: type: lvm vg: "{{ host_name }}" diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index a925ca96..7a2e43ae 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -24,6 +24,11 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - main + - prometheus + + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index 331888db..d25bc325 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -24,6 +24,11 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - main + - prometheus + + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml index c02868b5..47a50970 100644 --- a/inventory/host_vars/ele-telesto.yml +++ b/inventory/host_vars/ele-telesto.yml @@ -27,6 +27,7 @@ apt_repo_components: - non-free ## for microcode updates spreadspace_apt_repo_components: + - main - prometheus diff --git a/inventory/hosts.ini b/inventory/hosts.ini index a7b41430..dbd5ed87 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -257,7 +257,7 @@ emc-master [emc:children] emc-dist emc-xx -emc-todelete +#emc-todelete [emc-dist] emc-dist0 @@ -407,8 +407,11 @@ promzone-chaos-at-home-server ele-mon [promzone-elevate-festival] ele-telesto +ele-dione +ele-helene [promzone-elevate-festival:children] promzone-elevate-festival-server +emc ## hoster |