diff options
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 2 | ||||
| -rw-r--r-- | roles/elevate/media/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/elevate/media/templates/dstat.sh.j2 | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index b0133585..6c60abee 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -67,7 +67,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.23.2 +kubernetes_version: 1.23.3 kubernetes_container_runtime: docker kubernetes_standalone_cni_variant: with-portmap diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml index 448d3537..cc32348b 100644 --- a/roles/elevate/media/tasks/main.yml +++ b/roles/elevate/media/tasks/main.yml @@ -11,8 +11,8 @@ # - name: install and configure nextcloud # import_tasks: nextcloud.yml -# - name: install dstat script -# template: -# src: dstat.sh.j2 -# dest: /usr/local/bin/dstat.sh -# mode: 0755 +- name: install dstat script + template: + src: dstat.sh.j2 + dest: /usr/local/bin/dstat.sh + mode: 0755 diff --git a/roles/elevate/media/templates/dstat.sh.j2 b/roles/elevate/media/templates/dstat.sh.j2 index fe1848da..2ff572fb 100644 --- a/roles/elevate/media/templates/dstat.sh.j2 +++ b/roles/elevate/media/templates/dstat.sh.j2 @@ -1,12 +1,12 @@ #!/bin/bash -SSD=$(readlink -f /dev/disk/by-id/ata-Samsung_SSD_840_Series_S14GNEACC92243K | xargs basename) -RAID_DISK0=$(readlink -f /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N6PJ1CSJ | xargs basename) -RAID_DISK1=$(readlink -f /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4ND0PVLUE | xargs basename) -RAID_DISK2=$(readlink -f /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N2AYHY8E | xargs basename) -RAID_DISK3=$(readlink -f /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N2AYH7RF | xargs basename) +SSD=$(readlink -f {{ install.disks.primary }} | xargs basename) +declare -a ZPOOL_DISKS +{% for disk in zfs_pools.storage.create_vdevs | split | select('ne', 'raidz') %} +ZPOOL_DISKS+=($(readlink -f {{ disk }} | xargs basename)) +{% endfor %} -DISKS="$SSD,$RAID_DISK0,$RAID_DISK1,$RAID_DISK2,$RAID_DISK3" +DISKS="$SSD"$(printf ",%s" "${ZPOOL_DISKS[@]}") if [ -n "$1" ]; then DISKS="$DISKS,$1" fi |