From 3a1633d35f1810af134ffc9f01c06bec7de8eff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 03:49:36 +0000 Subject: [PATCH 001/424] Bump ansible from 2.4.4.0 to 4.2.0 in /ansible-roles/dj-wasabi.telegraf Bumps [ansible](https://github.com/ansible/ansible) from 2.4.4.0 to 4.2.0. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/commits) --- updated-dependencies: - dependency-name: ansible dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ansible-roles/dj-wasabi.telegraf/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/dj-wasabi.telegraf/requirements.txt b/ansible-roles/dj-wasabi.telegraf/requirements.txt index f3b20214..8bca59ba 100644 --- a/ansible-roles/dj-wasabi.telegraf/requirements.txt +++ b/ansible-roles/dj-wasabi.telegraf/requirements.txt @@ -1,4 +1,4 @@ -ansible==2.4.4.0 +ansible==4.2.0 docker==3.3.0 molecule==2.13.1 testinfra==1.12.0 From 3866ea13fa87918ea46fadd0cc6d6af01b26175e Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:07:26 +0200 Subject: [PATCH 002/424] Update rockylinux-8.x-x86_64.json Fixes Rocky Linux for current Packer release --- rockylinux-8.x-x86_64.json | 102 ++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 664ec002..c731be93 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -1,48 +1,58 @@ { - "variables": { - "iso_url": "https://ftp.fau.de/rockylinux/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", - "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", - "iso_checksum_url": "https://ftp.fau.de/rockylinux/8.6/isos/x86_64/CHECKSUM", - "iso_checksum_type": "sha256", - "vm_name": "rockylinux-8.x-x86_64", - "http_dir": "http", - "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password": "password" - }, - "builders": [{ - "type": "qemu", - "accelerator": "kvm", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", - "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", - "vm_name": "{{ user `vm_name` }}", - "format": "qcow2", - "disk_size": "{{ user `disk_size` }}", - "net_device": "virtio-net", - "disk_interface": "virtio", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "boot_command": [ - "", - "linux inst.mbr biosdevname=0 net.ifnames=0 ", - "rootpw={{ user `ssh_password` }} ", - "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", - "" - ], - "boot_wait": "{{ user `boot_wait` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "qemuargs": [ - ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"] - ] - }], - "post-processors": [{ - "type": "manifest", - "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" - }] + "builders": [ + { + "accelerator": "kvm", + "boot_command": [ + "", + "linux inst.mbr biosdevname=0 net.ifnames=0 ", + "rootpw={{ user `ssh_password` }} ", + "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", + "" + ], + "boot_wait": "{{ user `boot_wait` }}", + "disk_interface": "virtio", + "disk_size": "{{ user `disk_size` }}", + "format": "qcow2", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "net_device": "virtio-net", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ], + "shutdown_command": "{{ user `shutdown_command` }}", + "ssh_password": "{{ user `ssh_password` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "type": "qemu", + "vm_name": "{{ user `vm_name` }}" + } + ], + "post-processors": [ + { + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", + "type": "manifest" + } + ], + "variables": { + "http_dir": "http", + "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", + "iso_checksum_type": "sha256", + "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", + "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", + "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "password", + "vm_name": "rockylinux-8.x-x86_64" + } } + From 6661564696563ebc86207bc36c586c9cc9eab14e Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:18:38 +0200 Subject: [PATCH 003/424] Update rockylinux-8.x-x86_64.json --- rockylinux-8.x-x86_64.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index c731be93..413160fc 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -1,4 +1,15 @@ { + "variables": { + "http_dir": "http", + "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", + "iso_checksum_type": "sha256", + "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", + "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", + "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "password", + "vm_name": "rockylinux-8.x-x86_64" + }, "builders": [ { "accelerator": "kvm", @@ -42,17 +53,6 @@ "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", "type": "manifest" } - ], - "variables": { - "http_dir": "http", - "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", - "iso_checksum_type": "sha256", - "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", - "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", - "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password": "password", - "vm_name": "rockylinux-8.x-x86_64" - } + ] } From 98cfdfc22b031cc971d15174901d1ffaa9f4b402 Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:20:33 +0200 Subject: [PATCH 004/424] Update rockylinux-8.x-x86_64.json --- rockylinux-8.x-x86_64.json | 111 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 413160fc..0d5fd35c 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -1,58 +1,57 @@ { - "variables": { - "http_dir": "http", - "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", - "iso_checksum_type": "sha256", - "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", - "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", - "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password": "password", - "vm_name": "rockylinux-8.x-x86_64" - }, - "builders": [ - { - "accelerator": "kvm", - "boot_command": [ - "", - "linux inst.mbr biosdevname=0 net.ifnames=0 ", - "rootpw={{ user `ssh_password` }} ", - "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", - "" - ], - "boot_wait": "{{ user `boot_wait` }}", - "disk_interface": "virtio", - "disk_size": "{{ user `disk_size` }}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "net_device": "virtio-net", - "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], - "shutdown_command": "{{ user `shutdown_command` }}", - "ssh_password": "{{ user `ssh_password` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "type": "qemu", - "vm_name": "{{ user `vm_name` }}" - } - ], - "post-processors": [ - { - "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", - "type": "manifest" - } - ] + "variables": { + "http_dir": "http", + "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", + "iso_checksum_type": "sha256", + "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", + "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", + "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "password", + "vm_name": "rockylinux-8.x-x86_64" + }, + "builders": [ + { + "accelerator": "kvm", + "boot_command": [ + "", + "linux inst.mbr biosdevname=0 net.ifnames=0 ", + "rootpw={{ user `ssh_password` }} ", + "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", + "" + ], + "boot_wait": "{{ user `boot_wait` }}", + "disk_interface": "virtio", + "disk_size": "{{ user `disk_size` }}", + "format": "qcow2", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "net_device": "virtio-net", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ], + "shutdown_command": "{{ user `shutdown_command` }}", + "ssh_password": "{{ user `ssh_password` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "type": "qemu", + "vm_name": "{{ user `vm_name` }}" + } + ], + "post-processors": [ + { + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", + "type": "manifest" + } + ] } - From 517f2b655aa294e2dbe6a00e86d89d803a659adc Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:22:18 +0200 Subject: [PATCH 005/424] Update rockylinux-8.x-x86_64.json --- rockylinux-8.x-x86_64.json | 82 ++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 0d5fd35c..5ea078c2 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -10,48 +10,44 @@ "ssh_password": "password", "vm_name": "rockylinux-8.x-x86_64" }, - "builders": [ - { - "accelerator": "kvm", - "boot_command": [ - "", - "linux inst.mbr biosdevname=0 net.ifnames=0 ", - "rootpw={{ user `ssh_password` }} ", - "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", - "" + "builders": [{ + "accelerator": "kvm", + "boot_command": [ + "", + "linux inst.mbr biosdevname=0 net.ifnames=0 ", + "rootpw={{ user `ssh_password` }} ", + "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", + "" + ], + "boot_wait": "{{ user `boot_wait` }}", + "disk_interface": "virtio", + "disk_size": "{{ user `disk_size` }}", + "format": "qcow2", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", + "iso_url": "{{ user `iso_url` }}", + "net_device": "virtio-net", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" ], - "boot_wait": "{{ user `boot_wait` }}", - "disk_interface": "virtio", - "disk_size": "{{ user `disk_size` }}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "net_device": "virtio-net", - "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", - "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] - ], - "shutdown_command": "{{ user `shutdown_command` }}", - "ssh_password": "{{ user `ssh_password` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "type": "qemu", - "vm_name": "{{ user `vm_name` }}" - } - ], - "post-processors": [ - { - "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", - "type": "manifest" - } - ] + [ + "-smp", + "{{ user `cpus` }}" + ] + ], + "shutdown_command": "{{ user `shutdown_command` }}", + "ssh_password": "{{ user `ssh_password` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "type": "qemu", + "vm_name": "{{ user `vm_name` }}" + }], + "post-processors": [{ + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", + "type": "manifest" + }] } From d566d77ca31783184aa53c1f6833a01c4bdd9658 Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:30:47 +0200 Subject: [PATCH 006/424] Update rockylinux-8.x-x86_64.json --- rockylinux-8.x-x86_64.json | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 5ea078c2..91b9560f 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -1,17 +1,28 @@ { "variables": { - "http_dir": "http", + "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", - "iso_checksum_type": "sha256", "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", - "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", + "iso_checksum_type": "sha256", + "vm_name": "rockylinux-8.x-x86_64", + "http_dir": "http", "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", "shutdown_command": "systemctl poweroff", - "ssh_password": "password", - "vm_name": "rockylinux-8.x-x86_64" + "ssh_password": "password" }, "builders": [{ + "type": "qemu", "accelerator": "kvm", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "vm_name": "{{ user `vm_name` }}", + "format": "qcow2", + "disk_size": "{{ user `disk_size` }}", + "net_device": "virtio-net", + "disk_interface": "virtio", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", "boot_command": [ "", "linux inst.mbr biosdevname=0 net.ifnames=0 ", @@ -20,15 +31,10 @@ "" ], "boot_wait": "{{ user `boot_wait` }}", - "disk_interface": "virtio", - "disk_size": "{{ user `disk_size` }}", - "format": "qcow2", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", - "iso_url": "{{ user `iso_url` }}", - "net_device": "virtio-net", - "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "{{ user `shutdown_command` }}", "qemuargs": [ [ "-m", @@ -38,16 +44,10 @@ "-smp", "{{ user `cpus` }}" ] - ], - "shutdown_command": "{{ user `shutdown_command` }}", - "ssh_password": "{{ user `ssh_password` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "type": "qemu", - "vm_name": "{{ user `vm_name` }}" + ] }], "post-processors": [{ - "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json", - "type": "manifest" + "type": "manifest", + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" }] } From b01e4c8f72b658eecb6855c146f1cd57852bb5d6 Mon Sep 17 00:00:00 2001 From: amizeranschi Date: Sat, 21 Jan 2023 14:34:17 +0200 Subject: [PATCH 007/424] Update rockylinux-8.x-x86_64.json --- rockylinux-8.x-x86_64.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 91b9560f..45ff4b6e 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -36,14 +36,8 @@ "ssh_password": "{{ user `ssh_password` }}", "shutdown_command": "{{ user `shutdown_command` }}", "qemuargs": [ - [ - "-m", - "{{ user `memory` }}" - ], - [ - "-smp", - "{{ user `cpus` }}" - ] + ["-m", "{{ user `memory` }}"], + ["-smp", "{{ user `cpus` }}"] ] }], "post-processors": [{ From ea339eb9263276085363aa4cc2b625ae41a6708e Mon Sep 17 00:00:00 2001 From: Sanjay Srikakulam Date: Mon, 23 Jan 2023 15:44:11 +0100 Subject: [PATCH 008/424] Add FSlimit to VGCN images and apply to htcondor Set 250GB as soft and 1TB as hard limit for the condor service --- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 7 +++++++ ansible-roles/setup-vgcn-bwcloud-secure.yml | 7 +++++++ ansible-roles/setup-vgcn-bwcloud.yml | 7 +++++++ requirements.yml | 3 +++ 4 files changed, 24 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index 0566c85b..253e7645 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -136,3 +136,10 @@ enable_journald: false enable_install_software: false enable_ansible_root_cron: true + + # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit + - role: usegalaxy-eu.fslimit + vars: + ulimit_fsize_unit: "condor.service" + ulimit_fsize_soft: 268435456000 + ulimit_fsize_hard: 1073741824000 diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml index c378c64d..257b6ca1 100644 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ b/ansible-roles/setup-vgcn-bwcloud-secure.yml @@ -136,3 +136,10 @@ enable_journald: false enable_install_software: false enable_ansible_root_cron: true + + # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit + - role: usegalaxy-eu.fslimit + vars: + ulimit_fsize_unit: "condor.service" + ulimit_fsize_soft: 268435456000 + ulimit_fsize_hard: 1073741824000 diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 3d676aad..462321ea 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -137,3 +137,10 @@ enable_journald: false enable_install_software: false enable_ansible_root_cron: true + + # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit + - role: usegalaxy-eu.fslimit + vars: + ulimit_fsize_unit: "condor.service" + ulimit_fsize_soft: 268435456000 + ulimit_fsize_hard: 1073741824000 diff --git a/requirements.yml b/requirements.yml index da480e66..f909783b 100644 --- a/requirements.yml +++ b/requirements.yml @@ -39,3 +39,6 @@ roles: - name: usegalaxy-eu.autoupdates src: https://github.com/usegalaxy-eu/ansible-autoupdates version: 0.0.1 + - name: usegalaxy-eu.fslimit + src: https://github.com/usegalaxy-eu/ansible-fslimit + version: main From 120d520fc5beca3303e42069eafa4936cfa44b0a Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:44:32 +0100 Subject: [PATCH 009/424] add PACKER_PATH env variable --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e7a2a7c8..763561d8 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,17 @@ # * support building with non-qemu builders and convert to qemu afterwards # * testing target # * auto-detect flavors -PACKER := $(shell which packer) + +ifndef ${PACKER_PATH} + PACKER := ${PACKER_PATH} +else + PACKER := $(shell which packer) +endif ifndef PACKER -$(error packer not found, please install it) + $(error packer not found, please install it) endif + ANSIBLE_DIR=ansible-roles # the "provisioning" flavor, expects a 'setup-.yml' playbook # in the 'ansible-roles' submodule! This will likely change... From dfcc46f8804342a18ec1cf1afb07c8dc81cdfb60 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:03:23 +0100 Subject: [PATCH 010/424] removed depricated iso_checksum_type --- rockylinux-8.x-x86_64.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json index 45ff4b6e..bfbd49ba 100644 --- a/rockylinux-8.x-x86_64.json +++ b/rockylinux-8.x-x86_64.json @@ -1,9 +1,8 @@ { "variables": { "iso_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso", - "iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", + "iso_checksum": "sha256:fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5", "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", - "iso_checksum_type": "sha256", "vm_name": "rockylinux-8.x-x86_64", "http_dir": "http", "kickstart_path": "rockylinux-8.x/anaconda-ks.cfg", @@ -14,7 +13,7 @@ "type": "qemu", "accelerator": "kvm", "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum_type` }}:{{ user `iso_checksum` }}", + "iso_checksum": "{{ user `iso_checksum` }}", "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", "vm_name": "{{ user `vm_name` }}", "format": "qcow2", From cfbcd337667a5adfacda86b679f88686ccc5761c Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:05:00 +0100 Subject: [PATCH 011/424] removed deprecated iso_checksum_type --- centos-7.x-x86_64.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/centos-7.x-x86_64.json b/centos-7.x-x86_64.json index 49ad9b6a..47b32b43 100644 --- a/centos-7.x-x86_64.json +++ b/centos-7.x-x86_64.json @@ -1,9 +1,8 @@ { "variables": { "iso_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-2003.iso", - "iso_checksum": "101bc813d2af9ccf534d112cbe8670e6d900425b297d1a4d2529c5ad5f226372", + "iso_checksum": "sha256:101bc813d2af9ccf534d112cbe8670e6d900425b297d1a4d2529c5ad5f226372", "iso_checksum_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/sha256sum.txt", - "iso_checksum_type": "sha256", "vm_name": "centos-7.x-x86_64", "http_dir": "http", "kickstart_path": "centos-7.x/anaconda-ks.cfg", @@ -15,7 +14,6 @@ "accelerator": "kvm", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", "vm_name": "{{ user `vm_name` }}", "format": "qcow2", From 041dba27b96673bb8661c25137aa7eb4ea815145 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:05:38 +0100 Subject: [PATCH 012/424] removed depricated iso_checksum_type --- centos-8.x-x86_64.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/centos-8.x-x86_64.json b/centos-8.x-x86_64.json index cdb418a0..1cca7658 100644 --- a/centos-8.x-x86_64.json +++ b/centos-8.x-x86_64.json @@ -1,9 +1,8 @@ { "variables": { "iso_url": "https://vault.centos.org/8.5.2111/isos/x86_64/CentOS-8.5.2111-x86_64-boot.iso", - "iso_checksum": "9602c69c52d93f51295c0199af395ca0edbe35e36506e32b8e749ce6c8f5b60a", + "iso_checksum": "sha256:9602c69c52d93f51295c0199af395ca0edbe35e36506e32b8e749ce6c8f5b60a", "iso_checksum_url": "https://vault.centos.org/8.5.2111/isos/x86_64/CHECKSUM", - "iso_checksum_type": "sha256", "vm_name": "centos-8.x-x86_64", "http_dir": "http", "kickstart_path": "centos-8.x/anaconda-ks.cfg", @@ -15,7 +14,6 @@ "accelerator": "kvm", "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", "vm_name": "{{ user `vm_name` }}", "format": "qcow2", From 38afbcd85177f4231c7cb1f22f5b853353355397 Mon Sep 17 00:00:00 2001 From: Sanjay Srikakulam Date: Mon, 23 Jan 2023 21:01:49 +0100 Subject: [PATCH 013/424] Add 'become' user to the fslimit role --- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 1 + ansible-roles/setup-vgcn-bwcloud-secure.yml | 1 + ansible-roles/setup-vgcn-bwcloud.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index 253e7645..483c724b 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -139,6 +139,7 @@ # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit - role: usegalaxy-eu.fslimit + become: yes vars: ulimit_fsize_unit: "condor.service" ulimit_fsize_soft: 268435456000 diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml index 257b6ca1..566215e2 100644 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ b/ansible-roles/setup-vgcn-bwcloud-secure.yml @@ -139,6 +139,7 @@ # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit - role: usegalaxy-eu.fslimit + become: yes vars: ulimit_fsize_unit: "condor.service" ulimit_fsize_soft: 268435456000 diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 462321ea..250b1b50 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -140,6 +140,7 @@ # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit - role: usegalaxy-eu.fslimit + become: yes vars: ulimit_fsize_unit: "condor.service" ulimit_fsize_soft: 268435456000 From 8e1717dd505949ace5fcad69ffe5901526513688 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 15:39:22 +0100 Subject: [PATCH 014/424] add rocky 9 --- rockylinux-9.x-x86_64.json | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 rockylinux-9.x-x86_64.json diff --git a/rockylinux-9.x-x86_64.json b/rockylinux-9.x-x86_64.json new file mode 100644 index 00000000..37d240d5 --- /dev/null +++ b/rockylinux-9.x-x86_64.json @@ -0,0 +1,46 @@ +{ + "variables": { + "iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.1-x86_64-boot.iso", + "iso_checksum": "sha256:a36753d0efbea2f54a3dc7bfaa4dba95efe9aa3d6af331d5c5b147ea91240c21", + "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", + "vm_name": "rockylinux-9.x-x86_64", + "http_dir": "http", + "kickstart_path": "rockylinux-9.x/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "password" + }, + "builders": [{ + "type": "qemu", + "accelerator": "kvm", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "vm_name": "{{ user `vm_name` }}", + "format": "qcow2", + "disk_size": "{{ user `disk_size` }}", + "net_device": "virtio-net", + "disk_interface": "virtio", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "boot_command": [ + "", + "linux inst.mbr biosdevname=0 net.ifnames=0 ", + "rootpw={{ user `ssh_password` }} ", + "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", + "" + ], + "boot_wait": "{{ user `boot_wait` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "{{ user `shutdown_command` }}", + "qemuargs": [ + ["-m", "{{ user `memory` }}"], + ["-smp", "{{ user `cpus` }}"] + ] + }], + "post-processors": [{ + "type": "manifest", + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" + }] +} From 9e9686fec43972c8b58a08d0e326d69de4514dc5 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 15:50:25 +0100 Subject: [PATCH 015/424] remove more iso_checksum_type --- ansible-roles/run-playbook-only-internal.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index 7c04a051..76e80d5d 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -6,7 +6,6 @@ "builders": [{ "type": "qemu", "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", - "iso_checksum_type": "none", "output_directory": "output-{{ user `image_dir` }}", "vm_name": "{{ user `vm_name` }}", "disk_image": "true", From 03f1e26ecba2071c31fe82c0fcc666436dea5c26 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 15:51:08 +0100 Subject: [PATCH 016/424] remove more iso_checksum_type --- ansible-roles/run-playbook-only.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index 5de328ad..21e35c49 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -5,7 +5,6 @@ "builders": [{ "type": "qemu", "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", - "iso_checksum_type": "none", "output_directory": "output-{{ user `image_dir` }}", "vm_name": "{{ user `vm_name` }}", "disk_image": "true", From 96bc9cc9ebec4deb10e9d353a6a5707b710a6a1a Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 15:54:12 +0100 Subject: [PATCH 017/424] add checksum url --- rockylinux-9.x-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rockylinux-9.x-x86_64.json b/rockylinux-9.x-x86_64.json index 37d240d5..f799d6fc 100644 --- a/rockylinux-9.x-x86_64.json +++ b/rockylinux-9.x-x86_64.json @@ -2,7 +2,7 @@ "variables": { "iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.1-x86_64-boot.iso", "iso_checksum": "sha256:a36753d0efbea2f54a3dc7bfaa4dba95efe9aa3d6af331d5c5b147ea91240c21", - "iso_checksum_url": "https://dl.rockylinux.org/vault/rocky/8.6/isos/x86_64/CHECKSUM", + "iso_checksum_url": "http://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.1-x86_64-boot.iso.CHECKSUM", "vm_name": "rockylinux-9.x-x86_64", "http_dir": "http", "kickstart_path": "rockylinux-9.x/anaconda-ks.cfg", From 26bb7c65f0b83e78405c38831e7d03b8c26c2110 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 15:59:52 +0100 Subject: [PATCH 018/424] =?UTF-8?q?bump=20autofs=200.0.1=20=E2=86=92=201.0?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index f909783b..c79b02fe 100644 --- a/requirements.yml +++ b/requirements.yml @@ -35,7 +35,7 @@ roles: version: 0.2.13 - src: https://github.com/usegalaxy-eu/ansible-autofs name: usegalaxy-eu.autofs - version: 0.0.9 + version: 1.0.0 - name: usegalaxy-eu.autoupdates src: https://github.com/usegalaxy-eu/ansible-autoupdates version: 0.0.1 From 556023ed948a0de7d0dba0441dcc7db415fbb30a Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:03:04 +0100 Subject: [PATCH 019/424] =?UTF-8?q?bump=20collection=20handy=202.7.9=20?= =?UTF-8?q?=E2=86=92=202.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index c79b02fe..aa6e9414 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: usegalaxy_eu.handy - version: 2.7.9 + version: 2.10.0 source: https://galaxy.ansible.com - name: ansible.posix version: 1.3.0 From b93580c01090cffe8edf3c295863435c4b3198b5 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:04:06 +0100 Subject: [PATCH 020/424] =?UTF-8?q?bump=20ansible.posix=201.3.0=20?= =?UTF-8?q?=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index aa6e9414..02a689a4 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,7 +4,7 @@ collections: version: 2.10.0 source: https://galaxy.ansible.com - name: ansible.posix - version: 1.3.0 + version: 1.5.1 source: https://galaxy.ansible.com - name: amazon.aws version: 1.5.0 From b984a8736bf9d1da70555d92fbfa0fdfc8778b9a Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:17:15 +0100 Subject: [PATCH 021/424] =?UTF-8?q?bump=20packer=201.7.10=20=E2=86=92=201.?= =?UTF-8?q?8.5,=20remove=20commented=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible-roles/jenkins/tasks/main.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/ansible-roles/jenkins/tasks/main.yml b/ansible-roles/jenkins/tasks/main.yml index 6bdd9aa7..67c32b5d 100644 --- a/ansible-roles/jenkins/tasks/main.yml +++ b/ansible-roles/jenkins/tasks/main.yml @@ -12,34 +12,13 @@ - ruby - name: Download packer - shell: wget https://releases.hashicorp.com/packer/1.7.10/packer_1.7.10_linux_amd64.zip -O /tmp/packer.zip + shell: wget https://releases.hashicorp.com/packer/1.8.5/packer_1.8.5_linux_amd64.zip -O /tmp/packer.zip - name: Extract packer shell: unzip /tmp/packer.zip -d /usr/bin -#- name: Install rvm keys -# shell: gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -# -#- name: Install rvm -# shell: curl -sSL https://get.rvm.io | bash -s stable - -- name: Adding existing user centos to group kvm +- name: Adding existing user jenkins to group kvm user: - name: centos + name: jenkins groups: kvm append: yes - -#- name: Adding existing user centos to group rvm -# user: -# name: centos -# groups: rvm -# append: yes -# -#- name: Install recent ruby -# shell: rvm install 2.6 - -#- name: Download google chrome rpm -# shell: wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm -# -#- name: Install it -# shell: yum install -y google-chrome-stable_current_x86_64.rpm From 7fcfbabdae0ec2e5f3890d20f2fdf60e023ddc67 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:27:32 +0100 Subject: [PATCH 022/424] add checksum output --- rockylinux-9.x-x86_64.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rockylinux-9.x-x86_64.json b/rockylinux-9.x-x86_64.json index f799d6fc..50759694 100644 --- a/rockylinux-9.x-x86_64.json +++ b/rockylinux-9.x-x86_64.json @@ -42,5 +42,10 @@ "post-processors": [{ "type": "manifest", "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" + }, + { + "type": "checksum", + "checksum_types": ["sha256"], + "output": "output-{{ user `vm_name` }}-{{ build_type }}/base.checksum" }] } From 8db08ca13e09d759678bbda4b4b175158b07174b Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:30:43 +0100 Subject: [PATCH 023/424] add checksum --- ansible-roles/run-playbook-only.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index 21e35c49..18c918ff 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -5,6 +5,7 @@ "builders": [{ "type": "qemu", "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", + "iso_checksum": "file:output-{{ user `vm_name` }}-{{ build_type }}/base.checksum", "output_directory": "output-{{ user `image_dir` }}", "vm_name": "{{ user `vm_name` }}", "disk_image": "true", From fe69b18a1a80a5ce535b92ec648f9ecaa76b8aca Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:44:43 +0100 Subject: [PATCH 024/424] none is fine, too --- ansible-roles/run-playbook-only.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index 18c918ff..f28a7f0c 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -5,7 +5,7 @@ "builders": [{ "type": "qemu", "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", - "iso_checksum": "file:output-{{ user `vm_name` }}-{{ build_type }}/base.checksum", + "iso_checksum": "none", "output_directory": "output-{{ user `image_dir` }}", "vm_name": "{{ user `vm_name` }}", "disk_image": "true", From 5ef754995de5a294422894c8684a9ec64613c73d Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:46:18 +0100 Subject: [PATCH 025/424] none is fine --- ansible-roles/run-playbook-only-internal.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index 76e80d5d..b703d7f6 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -6,6 +6,7 @@ "builders": [{ "type": "qemu", "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", + "iso_checksum": "none", "output_directory": "output-{{ user `image_dir` }}", "vm_name": "{{ user `vm_name` }}", "disk_image": "true", From 01112a7cbe47e7e801080803502024b43a8d7e55 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:47:03 +0100 Subject: [PATCH 026/424] no checksum --- rockylinux-9.x-x86_64.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rockylinux-9.x-x86_64.json b/rockylinux-9.x-x86_64.json index 50759694..f799d6fc 100644 --- a/rockylinux-9.x-x86_64.json +++ b/rockylinux-9.x-x86_64.json @@ -42,10 +42,5 @@ "post-processors": [{ "type": "manifest", "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" - }, - { - "type": "checksum", - "checksum_types": ["sha256"], - "output": "output-{{ user `vm_name` }}-{{ build_type }}/base.checksum" }] } From b779d3cb5cd0200f3e57592b7aa4705572379e99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 23:35:57 +0000 Subject: [PATCH 027/424] Bump ansible from 4.2.0 to 7.0.0 in /ansible-roles/dj-wasabi.telegraf Bumps [ansible](https://github.com/ansible/ansible) from 4.2.0 to 7.0.0. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/commits) --- updated-dependencies: - dependency-name: ansible dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ansible-roles/dj-wasabi.telegraf/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/dj-wasabi.telegraf/requirements.txt b/ansible-roles/dj-wasabi.telegraf/requirements.txt index 8bca59ba..3eb48f58 100644 --- a/ansible-roles/dj-wasabi.telegraf/requirements.txt +++ b/ansible-roles/dj-wasabi.telegraf/requirements.txt @@ -1,4 +1,4 @@ -ansible==4.2.0 +ansible==7.0.0 docker==3.3.0 molecule==2.13.1 testinfra==1.12.0 From 62f36f599c4ad12ab929f9a93d24088be99115dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 23:37:23 +0000 Subject: [PATCH 028/424] Bump ansible from 4.7.0 to 7.0.0 Bumps [ansible](https://github.com/ansible/ansible) from 4.7.0 to 7.0.0. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/commits) --- updated-dependencies: - dependency-name: ansible dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 881605e7..b900566d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -ansible==4.7.0 +ansible==7.0.0 python-openstackclient==3.14.0 From 266aba483e9064b5cc7cdc073a03ede04602c458 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 25 Jan 2023 09:58:13 +0100 Subject: [PATCH 029/424] version 7.0.0 not available for Rocky 8 yet --- ansible-roles/dj-wasabi.telegraf/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/dj-wasabi.telegraf/requirements.txt b/ansible-roles/dj-wasabi.telegraf/requirements.txt index 3eb48f58..1b567a49 100644 --- a/ansible-roles/dj-wasabi.telegraf/requirements.txt +++ b/ansible-roles/dj-wasabi.telegraf/requirements.txt @@ -1,4 +1,4 @@ -ansible==7.0.0 +ansible==6.7.0 docker==3.3.0 molecule==2.13.1 testinfra==1.12.0 From 75e9c0db0948184619714c3b26b9fc5e64809855 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 25 Jan 2023 09:59:01 +0100 Subject: [PATCH 030/424] ansible 7.0.0 not available for rocky 8 yet --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b900566d..7c8881aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -ansible==7.0.0 +ansible==6.7.0 python-openstackclient==3.14.0 From 12b3e74a41fa8e19e98e6896d7ea2790811347e7 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:37:27 +0100 Subject: [PATCH 031/424] change PACKER var --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 763561d8..ae8e94a8 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,9 @@ # * testing target # * auto-detect flavors -ifndef ${PACKER_PATH} - PACKER := ${PACKER_PATH} -else - PACKER := $(shell which packer) +PACKER := $(shell which packer) +ifdef ${PACKER_PATH} + PACKER = ${PACKER_PATH} endif ifndef PACKER $(error packer not found, please install it) From 7ed6dee8842d8d3d3877bdf25b2bd054a398e926 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:37:27 +0100 Subject: [PATCH 032/424] change PACKER var --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 763561d8..ae8e94a8 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,9 @@ # * testing target # * auto-detect flavors -ifndef ${PACKER_PATH} - PACKER := ${PACKER_PATH} -else - PACKER := $(shell which packer) +PACKER := $(shell which packer) +ifdef ${PACKER_PATH} + PACKER = ${PACKER_PATH} endif ifndef PACKER $(error packer not found, please install it) From 52a69a6145e1c25164cbcd2c9e12fe5b38b67de3 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 25 Jan 2023 14:54:35 +0100 Subject: [PATCH 033/424] changes for Rocky9 --- http/rockylinux-9.x/anaconda-ks.cfg | 53 +++++++++++++++++++++++++++++ rockylinux-9.x-x86_64.json | 3 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 http/rockylinux-9.x/anaconda-ks.cfg diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg new file mode 100644 index 00000000..25e18493 --- /dev/null +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -0,0 +1,53 @@ +text +reboot +url --url=https://ftp.fau.de/rockylinux/9/BaseOS/x86_64/os/ +lang en_US.UTF-8 +keyboard --vckeymap=us --xlayouts='us' +timezone Europe/Berlin --isUtc --nontp +clearpart --none --initlabel +bootloader --location=mbr --boot-drive=vda +part biosboot --fstype="biosboot" --ondisk=vda --size=1 +part / --fstype="xfs" --ondisk=vda --grow --label=system + +%packages +@core +@^minimal install +kexec-tools +%end + +# small python script to extract the password from the kernel command line +# expects the password given as: rootpw= +%pre --interpreter=/usr/libexec/platform-python +import shlex, crypt +arg = 'rootpw=' +with open('/proc/cmdline', 'r') as f: + kcl = f.read().split() +# extract the password +passwords = [x[len(arg):] for x in kcl if x.startswith(arg)] +if len(passwords) == 1: + kclpass = passwords[0] +# TODO sane fallbacks. This should work most of the time though :) +# generate SHA512 hash +hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512)) +with open('/tmp/setup-root-pass', 'w') as f: + f.write('rootpw --iscrypted ' + hash) +%end +# include the created password file +%include /tmp/setup-root-pass + +%post --erroronfail +yum -y update +yum -y install wget +yum -y install epel-release +yum -y install ansible +# allow root login for ansible +sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config + +ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Wed, 25 Jan 2023 16:04:46 +0100 Subject: [PATCH 034/424] more changes for rocky 9 --- ansible-roles/run-playbook-only-internal.json | 3 ++- ansible-roles/run-playbook-only.json | 3 ++- http/rockylinux-9.x/anaconda-ks.cfg | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index b703d7f6..e8db9120 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -19,7 +19,8 @@ "shutdown_command": "shutdown -P now", "qemuargs": [ ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"] + ["-smp", "{{ user `cpus` }}"], + ["-cpu", "host"] ] }], "provisioners": [{ diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index f28a7f0c..8427647d 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -18,7 +18,8 @@ "shutdown_command": "shutdown -P now", "qemuargs": [ ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"] + ["-smp", "{{ user `cpus` }}"], + ["-cpu", "host"] ] }], "provisioners": [{ diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 25e18493..3478b17f 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -6,7 +6,12 @@ keyboard --vckeymap=us --xlayouts='us' timezone Europe/Berlin --isUtc --nontp clearpart --none --initlabel bootloader --location=mbr --boot-drive=vda -part biosboot --fstype="biosboot" --ondisk=vda --size=1 +#part biosboot --fstype="biosboot" --ondisk=vda --size=1 +# Clear the Master Boot Record +firstboot --disable +zerombr +# # Remove partitions +clearpart --all --initlabel part / --fstype="xfs" --ondisk=vda --grow --label=system %packages @@ -30,7 +35,7 @@ if len(passwords) == 1: # generate SHA512 hash hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512)) with open('/tmp/setup-root-pass', 'w') as f: - f.write('rootpw --iscrypted ' + hash) + f.write('rootpw --allow-ssh --iscrypted ' + hash) %end # include the created password file %include /tmp/setup-root-pass @@ -41,7 +46,7 @@ yum -y install wget yum -y install epel-release yum -y install ansible # allow root login for ansible -sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config +#sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Thu, 26 Jan 2023 09:03:51 +0100 Subject: [PATCH 035/424] change ssh config for ansible --- ansible-roles/run-playbook-only.json | 62 ++++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index 8427647d..e7a1e0b5 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -1,29 +1,37 @@ { - "variables": { - "ssh_password": "password" - }, - "builders": [{ - "type": "qemu", - "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", - "iso_checksum": "none", - "output_directory": "output-{{ user `image_dir` }}", - "vm_name": "{{ user `vm_name` }}", - "disk_image": "true", - "format": "qcow2", - "disk_size": "{{ user `disk_size` }}", - "headless": "{{ user `headless` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "shutdown -P now", - "qemuargs": [ - ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"], - ["-cpu", "host"] - ] - }], - "provisioners": [{ - "type": "ansible", - "playbook_file": "{{ template_dir }}/{{ user `playbook` }}" - }] + "variables": { + "ssh_password": "password" + }, + "builders": [ + { + "type": "qemu", + "accelerator": "kvm", + "iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}", + "iso_checksum": "none", + "output_directory": "output-{{ user `image_dir` }}", + "vm_name": "{{ user `vm_name` }}", + "disk_image": "true", + "format": "qcow2", + "disk_size": "{{ user `disk_size` }}", + "headless": "{{ user `headless` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "shutdown -P now", + "qemuargs": [ + ["-m", "{{ user `memory` }}"], + ["-smp", "{{ user `cpus` }}"], + ["-cpu", "host"] + ] + } + ], + "provisioners": [ + { + "type": "ansible", + "playbook_file": "{{ template_dir }}/{{ user `playbook` }}", + "ansible_env_vars": "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa', ANSIBLE_HOST_KEY_CHECKING=False, ANSIBLE_SCP_EXTRA_ARGS = '-0'", + "user": "root", + "extra_arguments": ["--scp-extra-args", "'-O'"] + } + ] } From 6d8d8fbcee1710270111982303ba123636552c0e Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 31 Jan 2023 11:27:33 +0100 Subject: [PATCH 036/424] updated requirements --- requirements.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements.yml b/requirements.yml index 02a689a4..210fe579 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: name: influxdata.chrony version: 0.1.0 - src: galaxyproject.pulsar - version: 1.0.9 + version: 1.0.10 - src: https://github.com/usegalaxy-eu/ansible-dynmotd name: usegalaxy-eu.dynmotd version: 0.0.1 @@ -30,9 +30,9 @@ roles: - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java - version: 2.0.1 + version: 2.2.0 - src: galaxyproject.cvmfs - version: 0.2.13 + version: 0.2.20 - src: https://github.com/usegalaxy-eu/ansible-autofs name: usegalaxy-eu.autofs version: 1.0.0 @@ -42,3 +42,5 @@ roles: - name: usegalaxy-eu.fslimit src: https://github.com/usegalaxy-eu/ansible-fslimit version: main + - name: dj-wasabi.telegraf + version: 0.14.0 From 36ada427ef2354e913a7a6b43f1e182c49f766f5 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 31 Jan 2023 14:52:45 +0100 Subject: [PATCH 037/424] updated versions --- ansible-roles/group_vars/all.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 29bbe836..63c774f3 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -10,8 +10,14 @@ galaxy_gid: 999 replace_non_galaxy_999: true -telegraf_agent_version: 1.17.2 -telegraf_agent_output: {} +telegraf_agent_package_state: latest +telegraf_agent_output: + - type: influxdb + config: + - urls = ["https://example.org"] + - database = "dummy_db" + - username = "example" + - password = "password1234" telegraf_agent_tags: - tag_name: datacenter tag_value: rz From 4634544d8f7afe6e38aefdeccb0a87d45bba2ba8 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 31 Jan 2023 14:53:03 +0100 Subject: [PATCH 038/424] updated versions --- requirements.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.yml b/requirements.yml index 210fe579..c6ea73f8 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: usegalaxy_eu.handy - version: 2.10.0 + version: 2.11.0 source: https://galaxy.ansible.com - name: ansible.posix version: 1.5.1 @@ -25,8 +25,8 @@ roles: - src: https://github.com/usegalaxy-eu/ansible-dynmotd name: usegalaxy-eu.dynmotd version: 0.0.1 - - src: usegalaxy_eu.htcondor - version: 1.0.1 + #- src: usegalaxy_eu.htcondor + #version: 1.0.1 - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java From bd61a97d29025a56e0c1a9881e16f8673e0486c7 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 2 Feb 2023 16:41:34 +0100 Subject: [PATCH 039/424] updated playbooks --- ansible-roles/setup-generic.yml | 2 +- ansible-roles/setup-jenkins.yml | 49 ++++++++------ ansible-roles/setup-vgcn-bwcloud-gpu.yml | 19 +++++- ansible-roles/setup-vgcn-bwcloud-secure.yml | 41 ++++++++---- ansible-roles/setup-vgcn-bwcloud.yml | 72 +++++++++++---------- 5 files changed, 111 insertions(+), 72 deletions(-) diff --git a/ansible-roles/setup-generic.yml b/ansible-roles/setup-generic.yml index 8583acbc..5c73afe1 100644 --- a/ansible-roles/setup-generic.yml +++ b/ansible-roles/setup-generic.yml @@ -39,5 +39,5 @@ - geerlingguy.repo-epel # Install EPEL - usegalaxy-eu.autoupdates # keep all of our packages up to date - usegalaxy-eu.dynmotd - - dj-wasabi.telegraf - influxdata.chrony + - dj-wasabi.telegraf diff --git a/ansible-roles/setup-jenkins.yml b/ansible-roles/setup-jenkins.yml index 0a7a8183..321dcb0a 100644 --- a/ansible-roles/setup-jenkins.yml +++ b/ansible-roles/setup-jenkins.yml @@ -20,27 +20,37 @@ ansible.builtin.dnf: name: '*' state: latest - - name: Install some dependencies - become: yes - ansible.builtin.dnf: - state: latest + - name: Install dependencies + package: + name: + - git + - virtualenv + - python3 + become: true + when: ansible_os_family == 'Debian' + - name: Install dependencies + package: + name: + - git + - python36-virtualenv + - python3 + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 + - name: Install dependencies + package: name: - git - - python38 - - python3-devel - - python3-virtualenv - - gcc - - curl - libcurl-devel - - openssl-devel - - qemu-kvm - - qemu-img - - unzip - - seabios + - python-devel + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - name: Set default version of Python ansible.builtin.alternatives: name: python - path: /usr/bin/python3.8 + path: /usr/bin/python3 + link: /usr/bin/python - name: Ensure SELinux is set to enforcing mode ansible.builtin.lineinfile: path: /etc/selinux/config @@ -48,17 +58,18 @@ line: SELINUX=enforcing post_tasks: - - name: Set default version of Python + - name: Set default version of Java ansible.builtin.alternatives: name: java link: /usr/bin/java path: /usr/lib/jvm/java-11-openjdk/bin/java - name: Download packer - ansible.builtin.shell: wget https://releases.hashicorp.com/packer/1.7.10/packer_1.7.10_linux_amd64.zip -O /tmp/packer.zip + ansible.builtin.command: yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo - name: Extract packer - ansible.builtin.shell: unzip /tmp/packer.zip -d /usr/bin + ansible.builtin.yum: + name: packer - name: Adding existing user centos to group kvm ansible.builtin.user: @@ -85,6 +96,6 @@ - usegalaxy-eu.dynmotd - geerlingguy.java - geerlingguy.docker - - dj-wasabi.telegraf - influxdata.chrony + - dj-wasabi.telegraf diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index 483c724b..bfb588c3 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -28,10 +28,23 @@ - curl - libcurl-devel - openssl-devel + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 + - name: Install Pulsar dependencies + package: + name: + - gcc + - curl + - git + - libcurl-devel + - python-devel + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - name: Set default version of Python ansible.builtin.alternatives: name: python path: /usr/bin/python3 + link: /usr/bin/python - name: Put SELinux in permissive mode, logging actions that would be blocked. ansible.builtin.lineinfile: path: /etc/selinux/config @@ -102,10 +115,10 @@ - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository - enable_remap_user: false + enable_remap_user: true enable_pam_limits: true enable_grub: true - enable_cgroups: true + enable_cgroups: false enable_journald: true enable_install_software: true enable_ansible_root_cron: false @@ -118,8 +131,8 @@ - usegalaxy_eu.htcondor - - dj-wasabi.telegraf - influxdata.chrony + - dj-wasabi.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml index 566215e2..03082b78 100644 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ b/ansible-roles/setup-vgcn-bwcloud-secure.yml @@ -8,30 +8,43 @@ - "group_vars/pulsar.yml" - "group_vars/condor.yml" pre_tasks: - - name: system update + - name: System update ansible.builtin.dnf: - name: '*' + name: "*" state: latest exclude: condor* + - name: Install Pulsar dependencies - become: yes - ansible.builtin.dnf: - state: latest + package: + name: + - git + - virtualenv + - python3 + become: true + when: ansible_os_family == 'Debian' + - name: Install Pulsar dependencies + package: + name: + - git + - python36-virtualenv + - python3 + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 + - name: Install Pulsar dependencies + package: name: - git - - python36 - - python3-devel - - python3-virtualenv - - python38 - - python38-devel - - gcc - - curl - libcurl-devel - - openssl-devel + - python-devel + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - name: Set default version of Python ansible.builtin.alternatives: name: python path: /usr/bin/python3 + link: /usr/bin/python - name: Put SELinux in permissive mode, logging actions that would be blocked. ansible.builtin.lineinfile: path: /etc/selinux/config @@ -119,8 +132,8 @@ - usegalaxy_eu.htcondor - - dj-wasabi.telegraf - influxdata.chrony + - dj-wasabi.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 250b1b50..1d471184 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -8,60 +8,59 @@ - "group_vars/grub.yml" - "group_vars/pulsar.yml" - "group_vars/condor.yml" + - "secret_group_vars/all.yml" pre_tasks: - name: system update ansible.builtin.dnf: - name: '*' + name: "*" state: latest exclude: condor* - name: Install Pulsar dependencies - become: yes - ansible.builtin.dnf: - state: latest + package: + name: + - git + - virtualenv + - python3 + become: true + when: ansible_os_family == 'Debian' + - name: Install Pulsar dependencies + package: + name: + - git + - python36-virtualenv + - python3 + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 + - name: Install Pulsar dependencies + package: name: - git - - python36 - - python3-devel - - python3-virtualenv - - python38 - - python38-devel - - gcc - - curl - libcurl-devel - - openssl-devel + - python-devel + state: present + become: true + when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - name: Set default version of Python ansible.builtin.alternatives: name: python path: /usr/bin/python3 + link: /usr/bin/python - name: Disable SELinux. ansible.builtin.lineinfile: path: /etc/selinux/config - regexp: '^SELINUX=' + regexp: "^SELINUX=" line: SELINUX=disabled - name: "Deploy docker-stop-1M script" ansible.builtin.copy: content: | - #!/bin/bash - docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop + #!/bin/bash + docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop dest: /usr/bin/docker-stop-1M owner: root group: root mode: 0755 post_tasks: - - name: galaxy account group - ansible.builtin.group: - gid: "{{ galaxy_gid }}" - name: galaxy - state: present - - name: galaxy account user - ansible.builtin.user: - uid: "{{ galaxy_uid }}" - name: galaxy - group: galaxy - home: /opt/galaxy - state: present - comment: Galaxy Service-Acct - createhome: no - ansible.builtin.user: name: galaxy groups: condor,docker @@ -79,12 +78,12 @@ ansible.builtin.copy: src: daemon.json dest: /etc/docker/daemon.json - mode: '0644' + mode: "0644" - name: Restart Docker service, in all cases ansible.builtin.service: name: docker state: restarted - - name: Disable firewalld service + - name: Disable firewalld service # activate if its running (!) ansible.builtin.systemd: name: firewalld enabled: no @@ -103,14 +102,15 @@ - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository - enable_remap_user: false + enable_remap_user: true enable_kernel_5: true enable_pam_limits: true enable_grub: true - enable_cgroups: true + enable_cgroups: "{{ false if ansible_facts['distribution_major_version'] == '9' else true }}" enable_journald: true enable_install_software: true enable_ansible_root_cron: false + enable_create_user: true - usegalaxy-eu.autofs - usegalaxy-eu.dynmotd @@ -120,8 +120,10 @@ - usegalaxy_eu.htcondor - - dj-wasabi.telegraf - influxdata.chrony + - name: dj-wasabi.telegraf + vars: + telegraf_yum_gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key" - galaxyproject.cvmfs - galaxyproject.pulsar @@ -129,7 +131,7 @@ - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository - enable_remap_user: true # needs to be at the end, otherwise dnsmasq will occupy 999 slot + enable_remap_user: true # needs to be at the end, otherwise dnsmasq will occupy 999 slot enable_kernel_5: false enable_pam_limits: false enable_grub: false From ae8e293ced5a2dc6728bab5f137fa9fa63559935 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 2 Feb 2023 16:56:47 +0100 Subject: [PATCH 040/424] update requirements --- requirements.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index c6ea73f8..fa4a5956 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: usegalaxy_eu.handy - version: 2.11.0 + version: 2.11.1 source: https://galaxy.ansible.com - name: ansible.posix version: 1.5.1 @@ -12,9 +12,9 @@ collections: type: galaxy roles: - src: usegalaxy_eu.cuda - version: 1.0.4 + version: 1.1.0 - src: usegalaxy_eu.nvidia_container - version: 1.0.3 + version: 1.1.0 - src: geerlingguy.docker version: 4.1.3 - src: https://github.com/usegalaxy-eu/ansible-chrony @@ -24,7 +24,8 @@ roles: version: 1.0.10 - src: https://github.com/usegalaxy-eu/ansible-dynmotd name: usegalaxy-eu.dynmotd - version: 0.0.1 + version: + 0.0.1 #- src: usegalaxy_eu.htcondor #version: 1.0.1 - src: geerlingguy.repo-epel From 2c8fa95bb9dc41b44a310524e5a2b133550acb1d Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 2 Feb 2023 17:08:07 +0100 Subject: [PATCH 041/424] changed group vars --- ansible-roles/group_vars/all.yml | 14 +++++++------- ansible-roles/group_vars/pulsar.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 63c774f3..ab924e28 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -11,13 +11,13 @@ galaxy_gid: 999 replace_non_galaxy_999: true telegraf_agent_package_state: latest -telegraf_agent_output: - - type: influxdb - config: - - urls = ["https://example.org"] - - database = "dummy_db" - - username = "example" - - password = "password1234" +#telegraf_agent_output: +# - type: influxdb +# config: +# - urls = ["https://example.org"] +# - database = "dummy_db" +# - username = "example" +# - password = "password1234" telegraf_agent_tags: - tag_name: datacenter tag_value: rz diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible-roles/group_vars/pulsar.yml index 5c1a5360..682a59f1 100644 --- a/ansible-roles/group_vars/pulsar.yml +++ b/ansible-roles/group_vars/pulsar.yml @@ -1,6 +1,7 @@ pulsar_package_name: pulsar-app pulsar_package_version: 0.14.13 +pulsar_virtualenv_command: "python -m venv" pulsar_root: /opt/pulsar pulsar_persistence_dir: /data/share/persisted_data pulsar_staging_dir: /data/share/staging @@ -15,7 +16,6 @@ pulsar_systemd: true pulsar_systemd_enabled: false pulsar_systemd_runner: webless -pulsar_virtualenv_command: virtualenv-3 pulsar_separate_privileges: false pulsar_create_user: true From 2d9c23f5977291b995ca6efa8e5c890d1abb8ec5 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 12:00:16 +0100 Subject: [PATCH 042/424] Update requirements.yml --- requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.yml b/requirements.yml index fa4a5956..80cc3b31 100644 --- a/requirements.yml +++ b/requirements.yml @@ -26,8 +26,8 @@ roles: name: usegalaxy-eu.dynmotd version: 0.0.1 - #- src: usegalaxy_eu.htcondor - #version: 1.0.1 + - src: usegalaxy_eu.htcondor + version: 2.0.0 - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java From 1eeae174d618f51f8326e5d655129592aaf6bf64 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Fri, 3 Feb 2023 13:06:38 +0100 Subject: [PATCH 043/424] add secret group vars --- ansible-roles/group_vars/all.yml | 7 +++++++ ansible-roles/secret_group_vars/all.yml | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 ansible-roles/secret_group_vars/all.yml diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index ab924e28..396adaf7 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -134,3 +134,10 @@ software_groups_to_install: ## kernel_5 kernel_5_package: kernel-ml + +docker_daemon_options: + graph: "/scratch/docker" + dns: + - "8.8.8.8" + - "8.8.4.4" + diff --git a/ansible-roles/secret_group_vars/all.yml b/ansible-roles/secret_group_vars/all.yml new file mode 100644 index 00000000..790724c2 --- /dev/null +++ b/ansible-roles/secret_group_vars/all.yml @@ -0,0 +1,18 @@ +$ANSIBLE_VAULT;1.1;AES256 +62343037353665356331306533363033666531633833326664643230333265316134663564393737 +3164653836383633636432616533333936303233313461360a623733373230636136363961373638 +32353934323233343830616262393563366230363532373932346133613835643763656439333835 +6532393331323766660a663230663962393434353634336366353361626138393139666338653366 +32316436646464653631373565326636386331383965633834363061613065643335613264613961 +62333165663464393238333165373034396332386231303732633265646436356263373836393137 +61613634306364626234653832346338323430366137363430373531343938646333393064396337 +32343337346662653236316563643264636561386165316234353534643039326532373030383262 +65303561303836356237373034356666616165653634326539316365386538313036616162343435 +64636630636565643434306632386166363461613266663335396237383332613764363530343631 +64623736373830613838613637613632646364663531323838373832346234373633343762353465 +35663230386638626338386233643161343861346262363633396336353930636130346336306162 +64383165653065386239613534633535656534626565333338396536666161326663623736376430 +64383733323636623732303165663435626337323330376532303566653962316139373730303766 +35386233346635396632623261636338343636353334663339323563353631363265373339613638 +64306633313534666364363739316434353163343263353234663639343063666133653363376539 +64333237353363616463633630376432326630386464363536633936333038353535 From cb5a5df1d13a283fd34d72b70f0cbe4ad2ea6d72 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Fri, 3 Feb 2023 13:07:00 +0100 Subject: [PATCH 044/424] add ansible.cgf --- ansible.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 ansible.cfg diff --git a/ansible.cfg b/ansible.cfg new file mode 100644 index 00000000..58c4fe8c --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,12 @@ +[ssh_connection] +#pipelining = true + +[defaults] + +# use openssh so that we can persist connections +#transport = ssh + +vault_password_file=.vault_password + +#retry_files_enabled = false +#inventory = hosts From b79a014101b07e6d9c070b3de779fae65663b14d Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:16:50 +0100 Subject: [PATCH 045/424] Update requirements.yml --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 80cc3b31..83a89246 100644 --- a/requirements.yml +++ b/requirements.yml @@ -16,7 +16,7 @@ roles: - src: usegalaxy_eu.nvidia_container version: 1.1.0 - src: geerlingguy.docker - version: 4.1.3 + version: 6.1.0 - src: https://github.com/usegalaxy-eu/ansible-chrony name: influxdata.chrony version: 0.1.0 From b470df79b1d4a80e981ac595863411cd63b099bd Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:30:36 +0100 Subject: [PATCH 046/424] ensure docker dir exists --- ansible-roles/setup-vgcn-bwcloud.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 1d471184..ff88b279 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -74,6 +74,11 @@ - libcurl-devel - openssl-devel become: yes + - name: Ensure Docker directory extists + file: + state: directory + path: /etc/docker + mode: 0755 - name: Copy Docker daemon.json ansible.builtin.copy: src: daemon.json From 1b594ebeb768028133c624a47b576f067c0e309e Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:32:48 +0100 Subject: [PATCH 047/424] use as json copy --- ansible-roles/group_vars/all.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 396adaf7..9ac493ae 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -135,9 +135,9 @@ software_groups_to_install: ## kernel_5 kernel_5_package: kernel-ml -docker_daemon_options: - graph: "/scratch/docker" - dns: - - "8.8.8.8" - - "8.8.4.4" +#docker_daemon_options: +# graph: "/scratch/docker" +# dns: +# - "8.8.8.8" +# - "8.8.4.4" From 441868240b6cb3e8c277abfa3e9f54049cbde3a5 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:44:56 +0100 Subject: [PATCH 048/424] fix in htcondor --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 83a89246..6aa803a0 100644 --- a/requirements.yml +++ b/requirements.yml @@ -27,7 +27,7 @@ roles: version: 0.0.1 - src: usegalaxy_eu.htcondor - version: 2.0.0 + version: 2.0.1 - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java From 2eda2efb5a8b48980d8b047a19cf3666d5e37606 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:02:21 +0100 Subject: [PATCH 049/424] bump cvmfs --- requirements.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.yml b/requirements.yml index 6aa803a0..06d0f248 100644 --- a/requirements.yml +++ b/requirements.yml @@ -26,14 +26,15 @@ roles: name: usegalaxy-eu.dynmotd version: 0.0.1 - - src: usegalaxy_eu.htcondor - version: 2.0.1 + - name: usegalaxy_eu.htcondor + src: https://github.com/usegalaxy-eu/ansible-htcondor + version: main - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java version: 2.2.0 - src: galaxyproject.cvmfs - version: 0.2.20 + version: 0.2.21 - src: https://github.com/usegalaxy-eu/ansible-autofs name: usegalaxy-eu.autofs version: 1.0.0 From aa4581f144bf4b3d9b74f92af1cef4346877d062 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:42:25 +0100 Subject: [PATCH 050/424] changed back --- ansible-roles/group_vars/all.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 9ac493ae..6ba44e6c 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -135,9 +135,5 @@ software_groups_to_install: ## kernel_5 kernel_5_package: kernel-ml -#docker_daemon_options: -# graph: "/scratch/docker" -# dns: -# - "8.8.8.8" -# - "8.8.4.4" +docker_daemon_options: {} From 16933de2bf946585313f5e00f45a27748b05131b Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Fri, 3 Feb 2023 16:26:10 +0100 Subject: [PATCH 051/424] syntax --- ansible-roles/setup-vgcn-bwcloud.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index ff88b279..24674e8a 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -78,12 +78,16 @@ file: state: directory path: /etc/docker - mode: 0755 + mode: '0755' + user: root + group: root - name: Copy Docker daemon.json ansible.builtin.copy: src: daemon.json dest: /etc/docker/daemon.json - mode: "0644" + mode: '0644' + user: root + group: root - name: Restart Docker service, in all cases ansible.builtin.service: name: docker From 61246d18c797f20e2ad0f80f64c410101aa43afc Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 3 Feb 2023 17:11:55 +0100 Subject: [PATCH 052/424] graph is deprecated --- ansible-roles/files/daemon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/files/daemon.json b/ansible-roles/files/daemon.json index 1368c6a7..9f104161 100644 --- a/ansible-roles/files/daemon.json +++ b/ansible-roles/files/daemon.json @@ -1,4 +1,4 @@ { - "graph": "/scratch/docker", + "data-root": "/scratch/docker", "dns": ["8.8.8.8", "8.8.4.4"] } From 944a1e7e31b24393c590c5bef1e69ea23242c398 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Fri, 3 Feb 2023 17:22:53 +0100 Subject: [PATCH 053/424] syntax --- ansible-roles/setup-vgcn-bwcloud.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 24674e8a..c8e5ac26 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -79,15 +79,11 @@ state: directory path: /etc/docker mode: '0755' - user: root - group: root - name: Copy Docker daemon.json ansible.builtin.copy: src: daemon.json dest: /etc/docker/daemon.json mode: '0644' - user: root - group: root - name: Restart Docker service, in all cases ansible.builtin.service: name: docker From 7c2a9e45860ba815e44bd8a5fbd800bf3435713c Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:51:44 +0100 Subject: [PATCH 054/424] no vault --- ansible-roles/setup-vgcn-bwcloud.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index c8e5ac26..a5871844 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -8,7 +8,6 @@ - "group_vars/grub.yml" - "group_vars/pulsar.yml" - "group_vars/condor.yml" - - "secret_group_vars/all.yml" pre_tasks: - name: system update ansible.builtin.dnf: From 9f15cdd2c58bf97bc8a3c27f5dffb210e97cf8d0 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:52:28 +0100 Subject: [PATCH 055/424] no vault --- ansible-roles/secret_group_vars/all.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 ansible-roles/secret_group_vars/all.yml diff --git a/ansible-roles/secret_group_vars/all.yml b/ansible-roles/secret_group_vars/all.yml deleted file mode 100644 index 790724c2..00000000 --- a/ansible-roles/secret_group_vars/all.yml +++ /dev/null @@ -1,18 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -62343037353665356331306533363033666531633833326664643230333265316134663564393737 -3164653836383633636432616533333936303233313461360a623733373230636136363961373638 -32353934323233343830616262393563366230363532373932346133613835643763656439333835 -6532393331323766660a663230663962393434353634336366353361626138393139666338653366 -32316436646464653631373565326636386331383965633834363061613065643335613264613961 -62333165663464393238333165373034396332386231303732633265646436356263373836393137 -61613634306364626234653832346338323430366137363430373531343938646333393064396337 -32343337346662653236316563643264636561386165316234353534643039326532373030383262 -65303561303836356237373034356666616165653634326539316365386538313036616162343435 -64636630636565643434306632386166363461613266663335396237383332613764363530343631 -64623736373830613838613637613632646364663531323838373832346234373633343762353465 -35663230386638626338386233643161343861346262363633396336353930636130346336306162 -64383165653065386239613534633535656534626565333338396536666161326663623736376430 -64383733323636623732303165663435626337323330376532303566653962316139373730303766 -35386233346635396632623261636338343636353334663339323563353631363265373339613638 -64306633313534666364363739316434353163343263353234663639343063666133653363376539 -64333237353363616463633630376432326630386464363536633936333038353535 From de8af31d48f5980eabeb2712b51eda2cc221e427 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:53:09 +0100 Subject: [PATCH 056/424] no vault --- ansible.cfg | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 ansible.cfg diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index 58c4fe8c..00000000 --- a/ansible.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ssh_connection] -#pipelining = true - -[defaults] - -# use openssh so that we can persist connections -#transport = ssh - -vault_password_file=.vault_password - -#retry_files_enabled = false -#inventory = hosts From 453c12620c124a607cca1780b31b30be9e7a5f40 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 10:19:18 +0100 Subject: [PATCH 057/424] ssh hack --- ansible-roles/run-playbook-only-internal.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index e8db9120..743f152f 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -28,6 +28,9 @@ "playbook_file": "{{ template_dir }}/{{ user `playbook` }}", "extra_arguments": [ "--vault-password-file=.vault_pass" - ] + ], + "ansible_env_vars": "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa', ANSIBLE_HOST_KEY_CHECKING=False, ANSIBLE_SCP_EXTRA_ARGS = '-0'", + "user": "root", + "extra_arguments": ["--scp-extra-args", "'-O'"] }] } From dc3d7eb3dd3d89e0732f2edce3817a25b4e979a2 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Mon, 6 Feb 2023 10:41:56 +0100 Subject: [PATCH 058/424] syntax --- ansible-roles/run-playbook-only-internal.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index 743f152f..fcd7f338 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -26,11 +26,8 @@ "provisioners": [{ "type": "ansible", "playbook_file": "{{ template_dir }}/{{ user `playbook` }}", - "extra_arguments": [ - "--vault-password-file=.vault_pass" - ], "ansible_env_vars": "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa', ANSIBLE_HOST_KEY_CHECKING=False, ANSIBLE_SCP_EXTRA_ARGS = '-0'", "user": "root", - "extra_arguments": ["--scp-extra-args", "'-O'"] + "extra_arguments": ["--scp-extra-args", "'-O'", "--vault-password-file=.vault_pass"] }] } From 1da8d7d10f22cb9b5e1df1f4547f8e0064f41a37 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 17:52:33 +0100 Subject: [PATCH 059/424] deprecated -O in ansible 2.13.7 --- ansible-roles/run-playbook-only.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json index e7a1e0b5..b3e537b9 100644 --- a/ansible-roles/run-playbook-only.json +++ b/ansible-roles/run-playbook-only.json @@ -30,8 +30,7 @@ "type": "ansible", "playbook_file": "{{ template_dir }}/{{ user `playbook` }}", "ansible_env_vars": "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa', ANSIBLE_HOST_KEY_CHECKING=False, ANSIBLE_SCP_EXTRA_ARGS = '-0'", - "user": "root", - "extra_arguments": ["--scp-extra-args", "'-O'"] + "user": "root" } ] } From 22b230075990b8ef3f7b7fd7a4feb3df3f23f67f Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 17:53:06 +0100 Subject: [PATCH 060/424] deprecated -O in ansible 2.13.7 --- ansible-roles/run-playbook-only-internal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json index fcd7f338..ef25d758 100644 --- a/ansible-roles/run-playbook-only-internal.json +++ b/ansible-roles/run-playbook-only-internal.json @@ -28,6 +28,6 @@ "playbook_file": "{{ template_dir }}/{{ user `playbook` }}", "ansible_env_vars": "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa', ANSIBLE_HOST_KEY_CHECKING=False, ANSIBLE_SCP_EXTRA_ARGS = '-0'", "user": "root", - "extra_arguments": ["--scp-extra-args", "'-O'", "--vault-password-file=.vault_pass"] + "extra_arguments": ["--vault-password-file=.vault_pass"] }] } From 44d2123e173d43a3b7da96386436540ed1d3c0f5 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 17:58:58 +0100 Subject: [PATCH 061/424] add venv --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7ee44519..894bb0f2 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,8 @@ We have listed the versions we use, but other versions may work. | qemu | 2.5.0 | ## Building This Yourself +Create a python virtual environment using python 3.9 and install the requirements.txt +This ensures you get the correct ansible version, because some commands might fail otherwise. All of the images are designed to be as generic as possible so you can use them as-is. We will provide built images, but if you wish to build them yourself, From 0192fbe619313e58eb7247387c5f801f10faa511 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 6 Feb 2023 18:09:56 +0100 Subject: [PATCH 062/424] use the force --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ae8e94a8..2122d7f2 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ cloud_cleanup: deps: mkdir -p $(ANSIBLE_DIR) - ansible-galaxy install -p $(ANSIBLE_DIR) -r requirements.yml + ansible-galaxy install -p $(ANSIBLE_DIR) -r --force requirements.yml mkdir -p $(ANSIBLE_DIR)/collections ansible-galaxy collection install -p $(ANSIBLE_DIR)/collections -r requirements.yml From c989759ca56bdbaf5466ef6fee7972b4ff1c4501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Mon, 6 Feb 2023 20:10:51 +0100 Subject: [PATCH 063/424] fix force --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2122d7f2..f62f0678 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ cloud_cleanup: deps: mkdir -p $(ANSIBLE_DIR) - ansible-galaxy install -p $(ANSIBLE_DIR) -r --force requirements.yml + ansible-galaxy install -p $(ANSIBLE_DIR) --force -r requirements.yml mkdir -p $(ANSIBLE_DIR)/collections ansible-galaxy collection install -p $(ANSIBLE_DIR)/collections -r requirements.yml From e8f0b710b25ebdc2e9e721a2545ca1fb62d3dea3 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 7 Feb 2023 12:57:19 +0100 Subject: [PATCH 064/424] add logrotate --- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 1 + ansible-roles/setup-vgcn-bwcloud-secure.yml | 1 + ansible-roles/setup-vgcn-bwcloud.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index bfb588c3..cea7163a 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -139,6 +139,7 @@ - usegalaxy_eu.cuda - usegalaxy_eu.nvidia_container + - usegalaxy-eu.logrotate - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml index 03082b78..fad64e77 100644 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ b/ansible-roles/setup-vgcn-bwcloud-secure.yml @@ -138,6 +138,7 @@ - galaxyproject.cvmfs - galaxyproject.pulsar + - usegalaxy-eu.logrotate - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index a5871844..8fde03b0 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -131,7 +131,7 @@ - galaxyproject.cvmfs - galaxyproject.pulsar - + - usegalaxy-eu.logrotate - role: usegalaxy_eu.handy.os_setup vars: enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository From 8bce1916f2e55e5b26a181a9ad9d0fe3fe6818e8 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 7 Feb 2023 12:59:31 +0100 Subject: [PATCH 065/424] logrotate role --- .../usegalaxy-eu.logrotate/defaults/main.yml | 21 +++++++++++++++++++ .../usegalaxy-eu.logrotate/tasks/main.yml | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100644 ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml create mode 100644 ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml diff --git a/ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml b/ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml new file mode 100644 index 00000000..864c676f --- /dev/null +++ b/ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml @@ -0,0 +1,21 @@ +lp_logrotate_confd: + - path: galaxy + conf: | + /var/log/galaxy/*.log { + compress + copytruncate + daily + notifempty + missingok + rotate 1 + } + - path: atop + conf: | + /var/log/atop/atop_* { + compress + copytruncate + daily + notifempty + missingok + rotate 1 + } diff --git a/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml b/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml new file mode 100644 index 00000000..8b1a8f05 --- /dev/null +++ b/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml @@ -0,0 +1,7 @@ +--- +- name: Create logrotate files + blockinfile: + path: "/etc/logrotate.d/{{ item.path }}" + block: "{{ item.conf }}" + create: true + loop: "{{ lp_logrotate_confd }}" \ No newline at end of file From 95cdd8f38e875ebfbd020dc6108488c79a7e31fd Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 08:59:28 +0100 Subject: [PATCH 066/424] test condor --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 06d0f248..e298a33b 100644 --- a/requirements.yml +++ b/requirements.yml @@ -27,7 +27,7 @@ roles: version: 0.0.1 - name: usegalaxy_eu.htcondor - src: https://github.com/usegalaxy-eu/ansible-htcondor + src: https://github.com/mira-miracoli/ansible-htcondor version: main - src: geerlingguy.repo-epel version: 3.1.0 From dd5794b6cae092fc6e0fdacece273ea7ecf7cb6b Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 09:01:04 +0100 Subject: [PATCH 067/424] condor to internal --- ansible-roles/internal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/internal.yml b/ansible-roles/internal.yml index 83c32509..af191d6b 100644 --- a/ansible-roles/internal.yml +++ b/ansible-roles/internal.yml @@ -22,5 +22,6 @@ - ecdsa - ed25519 roles: + - usegalaxy_eu.htcondor - lock-root - cloudinit From bdbd246349e828dce1d6646727b9dd72fa7fbeeb Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 09:01:35 +0100 Subject: [PATCH 068/424] condor in internal --- ansible-roles/setup-vgcn-bwcloud.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 8fde03b0..0b2c504d 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -122,8 +122,6 @@ - geerlingguy.java - geerlingguy.docker - - usegalaxy_eu.htcondor - - influxdata.chrony - name: dj-wasabi.telegraf vars: From 5d872993a5ba42bdd456404d097bdee7b722f087 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 09:05:38 +0100 Subject: [PATCH 069/424] install only for external --- ansible-roles/external.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible-roles/external.yml b/ansible-roles/external.yml index a8c15e43..fb754fa3 100644 --- a/ansible-roles/external.yml +++ b/ansible-roles/external.yml @@ -3,5 +3,9 @@ vars_files: - "group_vars/all.yml" roles: + - role: usegalaxy_eu.htcondor + vars: + condor_role: "" + condor_enforce_role: false - lock-root - cloudinit From 8694648b170d3d7ed5a7fa57e60114072f5c6af3 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 10:02:17 +0100 Subject: [PATCH 070/424] add vault (again) --- ansible-roles/internal.yml | 1 + ansible-roles/secret_group_vars/internal.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 ansible-roles/secret_group_vars/internal.yml diff --git a/ansible-roles/internal.yml b/ansible-roles/internal.yml index af191d6b..80ea717b 100644 --- a/ansible-roles/internal.yml +++ b/ansible-roles/internal.yml @@ -4,6 +4,7 @@ internal: true vars_files: - "group_vars/all.yml" + - "secret_group_vars/internal.yml" pre_tasks: - name: Copy server key into VM temporarily copy: diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible-roles/secret_group_vars/internal.yml new file mode 100644 index 00000000..30d792f9 --- /dev/null +++ b/ansible-roles/secret_group_vars/internal.yml @@ -0,0 +1,12 @@ +$ANSIBLE_VAULT;1.1;AES256 +64336534623038636132343230386564316536633539626232643438376166656234333261356564 +3565306334643164663638356636303531316162366232630a313432366338643938323865643463 +31656164326538323062303538363230656235303736376334393331613538633930393633626539 +3237323431333135350a343131366334313430356538656538393832366264656332646235326566 +34643035646136336666316336393433313630626530383363623962623336306132323665346264 +65306630373831613436373563353838313533643035393739653063643862653666653063303565 +36366365646337376433623863316363343837653961326632343336313436646139346630363633 +64396463613238363130353563313836363139376162643139636562356534393432333839313966 +37653238636236333231313464613431643236613837396139333064316231653432663332383330 +31613366383130333334616534343336376564633233633566383132386563623633383764323864 +373639613437333135633534623830623630 From 71a18a260d9226836cac30e0fccaf9048daeba29 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:27:39 +0100 Subject: [PATCH 071/424] leave firewalld active --- ansible-roles/setup-vgcn-bwcloud.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 0b2c504d..5c2a2ff4 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -87,11 +87,11 @@ ansible.builtin.service: name: docker state: restarted - - name: Disable firewalld service # activate if its running (!) - ansible.builtin.systemd: - name: firewalld - enabled: no - state: stopped + #- name: Disable firewalld service # activate if its running (!) + # ansible.builtin.systemd: + # name: firewalld + # enabled: no + # state: stopped - name: Deploy a signal emitter for telegraf ansible.builtin.copy: content: | From d086586a82674a20fa236214bfce6056fe6574d3 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:48:33 +0100 Subject: [PATCH 072/424] no template copy --- ansible-roles/external.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/external.yml b/ansible-roles/external.yml index fb754fa3..a7998388 100644 --- a/ansible-roles/external.yml +++ b/ansible-roles/external.yml @@ -7,5 +7,6 @@ vars: condor_role: "" condor_enforce_role: false + condor_copy_template: false - lock-root - cloudinit From 710fcf5d58786a5188802cf26d4942cca312db3b Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 11:19:43 +0100 Subject: [PATCH 073/424] add ansible.cfg --- ansible-roles/ansible.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ansible-roles/ansible.cfg diff --git a/ansible-roles/ansible.cfg b/ansible-roles/ansible.cfg new file mode 100644 index 00000000..04afb738 --- /dev/null +++ b/ansible-roles/ansible.cfg @@ -0,0 +1,2 @@ +[deafults] +vault_password_file=.vault_pass \ No newline at end of file From 70c70d91edf1ed647e9cf95e3499f692ddce49a8 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 11:23:33 +0100 Subject: [PATCH 074/424] add ansible.cfg --- ansible.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ansible.cfg diff --git a/ansible.cfg b/ansible.cfg new file mode 100644 index 00000000..417d6e57 --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,2 @@ +[defaults] +vault_password_file=.vault_pass \ No newline at end of file From 8de5459ef0559ad311d0bd765694b9d4cddd2b78 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 12:17:28 +0100 Subject: [PATCH 075/424] changed vault --- ansible-roles/secret_group_vars/internal.yml | 22 ++++++++++---------- ansible.cfg | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 ansible.cfg diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible-roles/secret_group_vars/internal.yml index 30d792f9..d30af052 100644 --- a/ansible-roles/secret_group_vars/internal.yml +++ b/ansible-roles/secret_group_vars/internal.yml @@ -1,12 +1,12 @@ $ANSIBLE_VAULT;1.1;AES256 -64336534623038636132343230386564316536633539626232643438376166656234333261356564 -3565306334643164663638356636303531316162366232630a313432366338643938323865643463 -31656164326538323062303538363230656235303736376334393331613538633930393633626539 -3237323431333135350a343131366334313430356538656538393832366264656332646235326566 -34643035646136336666316336393433313630626530383363623962623336306132323665346264 -65306630373831613436373563353838313533643035393739653063643862653666653063303565 -36366365646337376433623863316363343837653961326632343336313436646139346630363633 -64396463613238363130353563313836363139376162643139636562356534393432333839313966 -37653238636236333231313464613431643236613837396139333064316231653432663332383330 -31613366383130333334616534343336376564633233633566383132386563623633383764323864 -373639613437333135633534623830623630 +37633531396638383732633766366163336665653839333964653135373039633134396635656265 +3163613062656632336430643036373462313232623733350a613739636439376565613262653739 +32396162326339633736663264346338323962313264346334656638646132363433366537623838 +6562303335643463360a633962316562623833626430376262623162656431343035653366303532 +39623532383266393764643134663365386134343639623136336537373239643364363365643265 +63656566303561333736613831353538333931613864303162373131356566373762363134366435 +64363966623839613837333138343633633430303336326465643739323166633231656563636434 +65623034323032656235653766343361383464383633313832336130633930653233313863373435 +64353264383132323833383033623035653464656138303538333165393138353464383135383265 +36363161383432646432616438636439343339373437333663313835663730643362626166323233 +383036643730643137393334353331303732 diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index 417d6e57..00000000 --- a/ansible.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[defaults] -vault_password_file=.vault_pass \ No newline at end of file From d9ab99032cc8fe92c1f1aae3402de86a2ee30790 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 14:35:11 +0100 Subject: [PATCH 076/424] add test credentials --- ansible-roles/secret_group_vars/internal.yml | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible-roles/secret_group_vars/internal.yml index d30af052..b332e15f 100644 --- a/ansible-roles/secret_group_vars/internal.yml +++ b/ansible-roles/secret_group_vars/internal.yml @@ -1,12 +1,13 @@ $ANSIBLE_VAULT;1.1;AES256 -37633531396638383732633766366163336665653839333964653135373039633134396635656265 -3163613062656632336430643036373462313232623733350a613739636439376565613262653739 -32396162326339633736663264346338323962313264346334656638646132363433366537623838 -6562303335643463360a633962316562623833626430376262623162656431343035653366303532 -39623532383266393764643134663365386134343639623136336537373239643364363365643265 -63656566303561333736613831353538333931613864303162373131356566373762363134366435 -64363966623839613837333138343633633430303336326465643739323166633231656563636434 -65623034323032656235653766343361383464383633313832336130633930653233313863373435 -64353264383132323833383033623035653464656138303538333165393138353464383135383265 -36363161383432646432616438636439343339373437333663313835663730643362626166323233 -383036643730643137393334353331303732 +30373866363937303038626137633134663664623833383461356461333764663965373265376539 +3461313632396232376366643030346364643666306438360a393966663638393763643037663531 +31643236373436323661303363393561386433363738336362376432666139383237623366343664 +6535333739316533310a613864353466373233306430313834653038323962333235323666663237 +30663636336636626231643233356139313038356438393862393263643439323463646134366461 +31626465613433653231333437623264623734646562663266643533323161326164336434323163 +65663237616338613461333766343930346535326462666336656433656139653832363136376335 +30623832613630336139313532613235356333353365636132656465363565396263386131383266 +34366163633536393938366565393438376133316166643861326665323837366361323437396238 +64306462346333373230663037316235666562323163646536643266663139663331343136323332 +34613939356139336535393463376636646639633162336333396138626661623538323233613331 +38333637303066326637 From 4815b1e1e1dc8c5ac2c6fa514144e0d861fe7bfd Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Wed, 8 Feb 2023 16:21:15 +0100 Subject: [PATCH 077/424] condor role to internal only --- ansible-roles/external.yml | 5 ---- ansible-roles/secret_group_vars/internal.yml | 24 ++++++++++---------- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 7 ------ ansible-roles/setup-vgcn-bwcloud-secure.yml | 2 -- ansible-roles/setup-vgcn-bwcloud.yml | 5 ---- 5 files changed, 12 insertions(+), 31 deletions(-) diff --git a/ansible-roles/external.yml b/ansible-roles/external.yml index a7998388..a8c15e43 100644 --- a/ansible-roles/external.yml +++ b/ansible-roles/external.yml @@ -3,10 +3,5 @@ vars_files: - "group_vars/all.yml" roles: - - role: usegalaxy_eu.htcondor - vars: - condor_role: "" - condor_enforce_role: false - condor_copy_template: false - lock-root - cloudinit diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible-roles/secret_group_vars/internal.yml index b332e15f..5b33888c 100644 --- a/ansible-roles/secret_group_vars/internal.yml +++ b/ansible-roles/secret_group_vars/internal.yml @@ -1,13 +1,13 @@ $ANSIBLE_VAULT;1.1;AES256 -30373866363937303038626137633134663664623833383461356461333764663965373265376539 -3461313632396232376366643030346364643666306438360a393966663638393763643037663531 -31643236373436323661303363393561386433363738336362376432666139383237623366343664 -6535333739316533310a613864353466373233306430313834653038323962333235323666663237 -30663636336636626231643233356139313038356438393862393263643439323463646134366461 -31626465613433653231333437623264623734646562663266643533323161326164336434323163 -65663237616338613461333766343930346535326462666336656433656139653832363136376335 -30623832613630336139313532613235356333353365636132656465363565396263386131383266 -34366163633536393938366565393438376133316166643861326665323837366361323437396238 -64306462346333373230663037316235666562323163646536643266663139663331343136323332 -34613939356139336535393463376636646639633162336333396138626661623538323233613331 -38333637303066326637 +31306439663937383830663838653963623331666136333366336561376531316233336234616239 +6265353732363630336438343762656635653563666337340a636530393564353532623366343366 +63646135303233663863613838313963616537323061373534363037343639353132356236373637 +3330646132383339660a353031356462613663386262343730396665323466333931613731623837 +62643939366664626561396262666266343230353538313537356239623539333337653331313634 +39306639363666663765383032653765646531653733303432656537623937666538616332626435 +35313466626261346431663766636163346434393666373462353436343735313532363930343636 +30666333663662373434613163316564623261306263656630653965333736643061666666383764 +65356434656131626534343537323666373961393639313535336631633166303462663865326436 +39313864643565363930323930623865313533313663356538306236663135353630626334666136 +37633134376364303266306163623439396439666439316438613232656637643862313464306137 +64333938323730303036 diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index cea7163a..15d5cf07 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -96,11 +96,6 @@ ansible.builtin.service: name: docker state: restarted - - name: Disable firewalld service - ansible.builtin.systemd: - name: firewalld - enabled: no - state: stopped - name: Deploy a signal emitter for telegraf ansible.builtin.copy: content: | @@ -129,8 +124,6 @@ - geerlingguy.java - geerlingguy.docker - - usegalaxy_eu.htcondor - - influxdata.chrony - dj-wasabi.telegraf diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml index fad64e77..af903b2d 100644 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ b/ansible-roles/setup-vgcn-bwcloud-secure.yml @@ -130,8 +130,6 @@ - geerlingguy.java - geerlingguy.docker - - usegalaxy_eu.htcondor - - influxdata.chrony - dj-wasabi.telegraf diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 5c2a2ff4..823a7a6b 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -87,11 +87,6 @@ ansible.builtin.service: name: docker state: restarted - #- name: Disable firewalld service # activate if its running (!) - # ansible.builtin.systemd: - # name: firewalld - # enabled: no - # state: stopped - name: Deploy a signal emitter for telegraf ansible.builtin.copy: content: | From fdc726eb450af32aaed25c02cfa4ae3cb397aa4e Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 16:37:25 +0100 Subject: [PATCH 078/424] =?UTF-8?q?bump=20htcondor=20=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.yml b/requirements.yml index e298a33b..de433891 100644 --- a/requirements.yml +++ b/requirements.yml @@ -27,8 +27,7 @@ roles: version: 0.0.1 - name: usegalaxy_eu.htcondor - src: https://github.com/mira-miracoli/ansible-htcondor - version: main + version: 2.1.0 - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java From 2d6378863d09b84bb270fddc5859d00c7019f557 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 8 Feb 2023 17:53:04 +0100 Subject: [PATCH 079/424] docker dir --- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index 15d5cf07..b3102237 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -87,6 +87,11 @@ - libcurl-devel - openssl-devel become: yes + - name: Ensure Docker directory extists + file: + state: directory + path: /etc/docker + mode: '0755' - name: Copy Docker daemon.json ansible.builtin.copy: src: daemon.json From 6ddbfd7f235f18c9a69ccd30e7b96c6c5ee4d289 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:07:24 +0100 Subject: [PATCH 080/424] SELinux was never enabled --- ansible-roles/setup-vgcn-bwcloud-secure.yml | 158 -------------------- 1 file changed, 158 deletions(-) delete mode 100644 ansible-roles/setup-vgcn-bwcloud-secure.yml diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml deleted file mode 100644 index af903b2d..00000000 --- a/ansible-roles/setup-vgcn-bwcloud-secure.yml +++ /dev/null @@ -1,158 +0,0 @@ -# Setup for Virtual Galaxy Compute Node -# This setup is valid for RHEL 8.x based systems. -# It has SELinux enabled and Meltdown, Spectre patches on ---- -- hosts: default - vars_files: - - "group_vars/all.yml" - - "group_vars/pulsar.yml" - - "group_vars/condor.yml" - pre_tasks: - - name: System update - ansible.builtin.dnf: - name: "*" - state: latest - exclude: condor* - - - name: Install Pulsar dependencies - package: - name: - - git - - virtualenv - - python3 - become: true - when: ansible_os_family == 'Debian' - - name: Install Pulsar dependencies - package: - name: - - git - - python36-virtualenv - - python3 - state: present - become: true - when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 - - name: Install Pulsar dependencies - package: - name: - - git - - libcurl-devel - - python-devel - state: present - become: true - when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - - name: Set default version of Python - ansible.builtin.alternatives: - name: python - path: /usr/bin/python3 - link: /usr/bin/python - - name: Put SELinux in permissive mode, logging actions that would be blocked. - ansible.builtin.lineinfile: - path: /etc/selinux/config - regexp: '^SELINUX=' - line: SELINUX=permissive - - name: "Deploy docker-stop-1M script" - ansible.builtin.copy: - content: | - #!/bin/bash - docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop - dest: /usr/bin/docker-stop-1M - owner: root - group: root - mode: 0755 - post_tasks: - - name: galaxy account group - ansible.builtin.group: - gid: "{{ galaxy_gid }}" - name: galaxy - state: present - - name: galaxy account user - ansible.builtin.user: - uid: "{{ galaxy_uid }}" - name: galaxy - group: galaxy - home: /opt/galaxy - state: present - comment: Galaxy Service-Acct - createhome: no - - ansible.builtin.user: - name: galaxy - groups: condor,docker - append: yes - - ansible.builtin.dnf: - name: "{{ packages }}" - state: absent - vars: - packages: - - gcc - - libcurl-devel - - openssl-devel - become: yes - - name: Copy Docker daemon.json - ansible.builtin.copy: - src: daemon.json - dest: /etc/docker/daemon.json - mode: '0644' - - name: Restart Docker service, in all cases - ansible.builtin.service: - name: docker - state: restarted - - name: Disable firewalld service - ansible.builtin.systemd: - name: firewalld - enabled: no - state: stopped - - name: Deploy a signal emitter for telegraf - ansible.builtin.copy: - content: | - #!/bin/bash - echo '{"alive":1}' - dest: /bin/iamalive - owner: telegraf - group: telegraf - mode: 0755 - roles: - - geerlingguy.repo-epel # Install EPEL - - role: usegalaxy_eu.handy.os_setup - vars: - enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository - enable_remap_user: false - enable_kernel_5: true - enable_pam_limits: true - enable_grub: true - enable_cgroups: true - enable_journald: true - enable_install_software: true - enable_ansible_root_cron: false - - - usegalaxy-eu.autofs - - usegalaxy-eu.dynmotd - - - geerlingguy.java - - geerlingguy.docker - - - influxdata.chrony - - dj-wasabi.telegraf - - - galaxyproject.cvmfs - - galaxyproject.pulsar - - - usegalaxy-eu.logrotate - - role: usegalaxy_eu.handy.os_setup - vars: - enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository - enable_remap_user: true # needs to be at the end, otherwise dnsmasq will occupy 999 slot - enable_kernel_5: false - enable_pam_limits: false - enable_grub: false - enable_cgroups: false - enable_journald: false - enable_install_software: false - enable_ansible_root_cron: true - - # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit - - role: usegalaxy-eu.fslimit - become: yes - vars: - ulimit_fsize_unit: "condor.service" - ulimit_fsize_soft: 268435456000 - ulimit_fsize_hard: 1073741824000 From 440c96f3e959d01a277faab0e30fd84216451e21 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:10:03 +0100 Subject: [PATCH 081/424] remove vgcn-bwcloud-secure --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f62f0678..5d3961d9 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif ANSIBLE_DIR=ansible-roles # the "provisioning" flavor, expects a 'setup-.yml' playbook # in the 'ansible-roles' submodule! This will likely change... -FLAVORS = vgcn-bwcloud vgcn-bwcloud-gpu vgcn-bwcloud-secure jenkins generic +FLAVORS = vgcn-bwcloud vgcn-bwcloud-gpu jenkins generic SUPPORTED_BUILDERS = qemu # check which hypervisors are available ifeq ($(shell which qemu-system-$(shell uname -m | sed 's/i686/i386/') 2>&1 > /dev/null && echo $$?), 0) From 19aa3210648b62964b26bd37e81a896a679896cb Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 9 Feb 2023 15:49:33 +0100 Subject: [PATCH 082/424] set permissive --- ansible-roles/setup-vgcn-bwcloud.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 823a7a6b..313571e6 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -45,11 +45,11 @@ name: python path: /usr/bin/python3 link: /usr/bin/python - - name: Disable SELinux. + - name: Set SELINUX to permissive ansible.builtin.lineinfile: path: /etc/selinux/config regexp: "^SELINUX=" - line: SELINUX=disabled + line: SELINUX=permissive - name: "Deploy docker-stop-1M script" ansible.builtin.copy: content: | @@ -118,9 +118,7 @@ - geerlingguy.docker - influxdata.chrony - - name: dj-wasabi.telegraf - vars: - telegraf_yum_gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key" + - dj-wasabi.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar From 5123bd41c86d6e5863d9d91fbdef8798979ea5e4 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:31:08 +0100 Subject: [PATCH 083/424] lint --- ansible-roles/ansible.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/ansible.cfg b/ansible-roles/ansible.cfg index 04afb738..40c4fa28 100644 --- a/ansible-roles/ansible.cfg +++ b/ansible-roles/ansible.cfg @@ -1,2 +1,2 @@ [deafults] -vault_password_file=.vault_pass \ No newline at end of file +vault_password_file=.vault_pass From 4f692079360c3feec7cf2f94a1d7c46a1cfe4b21 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:31:24 +0100 Subject: [PATCH 084/424] Delete ansible.cfg --- ansible-roles/ansible.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 ansible-roles/ansible.cfg diff --git a/ansible-roles/ansible.cfg b/ansible-roles/ansible.cfg deleted file mode 100644 index 40c4fa28..00000000 --- a/ansible-roles/ansible.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[deafults] -vault_password_file=.vault_pass From 5d72028aa79175f60818939f4d67565010ff253c Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:32:10 +0100 Subject: [PATCH 085/424] remove redundant code --- ansible-roles/group_vars/all.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 6ba44e6c..7660842f 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -11,13 +11,6 @@ galaxy_gid: 999 replace_non_galaxy_999: true telegraf_agent_package_state: latest -#telegraf_agent_output: -# - type: influxdb -# config: -# - urls = ["https://example.org"] -# - database = "dummy_db" -# - username = "example" -# - password = "password1234" telegraf_agent_tags: - tag_name: datacenter tag_value: rz From fc51db11244bbba63651a4c5023c8bf547209245 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:33:59 +0100 Subject: [PATCH 086/424] lint --- ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml b/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml index 8b1a8f05..ced9de9e 100644 --- a/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml +++ b/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml @@ -4,4 +4,4 @@ path: "/etc/logrotate.d/{{ item.path }}" block: "{{ item.conf }}" create: true - loop: "{{ lp_logrotate_confd }}" \ No newline at end of file + loop: "{{ lp_logrotate_confd }}" From ebec04289b3d08c1d7ecd8b11f8c549dfcf4e58b Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:09:31 +0100 Subject: [PATCH 087/424] Update README.md --- README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 894bb0f2..675a8ae7 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ Pre-built images are available here: [https://usegalaxy.eu/static/vgcn/](https:/ All in one image, a single image gets you: -- HTCondor - Pulsar - NFS - CVMFS -- Singularity +- Apptainer (former Singularity) - Docker +- Telegraf Everything you need to run Galaxy jobs. You can structure this in various ways that meet your needs: @@ -22,12 +22,26 @@ Everything you need to run Galaxy jobs. You can structure this in various ways t - Like EU's remote clusters: one VM as the condor master + pulsar, another as NFS, and the rest as job runners - For BYOC: A single node that does condor master + pulsar + job execution +**Important:** HTCondor has a new authentication mechanism, which uses passwords and tokens, generated automatically during startup. The easiest and least error-prone way to set this up is during [installation](https://htcondor.readthedocs.io/en/latest/getting-htcondor/admin-quick-start.html#administrative-quick-start-guide). +```diff +! This is why we removed HTCondor from public images. +``` +You can easily install it and set up your password by adding the `execute` installation line from the link above to your cloud-init script. There you can set your own password and host. Both should be identical on all machines you use, the host is the hostname or IP address of your central manager - usually the node that accepts Pulsar requests. An implementation in [Pulsar-Infrastructure-Playbook](https://github.com/usegalaxy-eu/pulsar-infrastructure-playbook) is in progress. ## Development Development happens into the __dev__ branch, images are built from __main__ branch. ## Changelog +- 70: + - ADDED: FS limit for condor.service (250GB soft, 1 TB hard) + - ADDED: UID and GID 999 will be remapped to make it available for galaxy (updated handy_os role) + - REMOVED: HTCondor removed from public images (see for reason above) + - MODIFIED: moved to Rocky Linux 9 + - MODIFIED: SELinux on permissive by default; the secure target bacame obsolete + - MODIFIED: updated Telegraf to version 1.18.2 + - MODIFIED: Singularity is now Apptainer + - MODIFIED: Bumped Ansible to version 6.7.0 - 60: - MODIFIED: moved to Rocky Linux 8 - 50: From 8318bdb0a0406eb02061b73d698138a09d328c27 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:19:34 +0100 Subject: [PATCH 088/424] Update README.md --- README.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 675a8ae7..b619411f 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Development happens into the __dev__ branch, images are built from __main__ bran - ADDED: FS limit for condor.service (250GB soft, 1 TB hard) - ADDED: UID and GID 999 will be remapped to make it available for galaxy (updated handy_os role) - REMOVED: HTCondor removed from public images (see for reason above) + - REMOVED: CentOS 7 support - MODIFIED: moved to Rocky Linux 9 - MODIFIED: SELinux on permissive by default; the secure target bacame obsolete - MODIFIED: updated Telegraf to version 1.18.2 @@ -68,6 +69,7 @@ Development happens into the __dev__ branch, images are built from __main__ bran ## Makefile We include a makefile that should build the images, running `make` will inform you of the available targets: +Please make sure to build the rockylinux-9.x-86_64/vgcn-bwcloud(-gpu)-**external** as last step. ```console $ make @@ -77,18 +79,21 @@ Detected builders: Base images: centos-8.x-x86_64/base rockylinux-8.x-x86_64/base - centos-7.x-x86_64/base + rockylinux-9.x-x86_64/base Provisioning: centos-8.x-x86_64/vgcn-bwcloud + centos-8.x-x86_64/vgcn-bwcloud-gpu centos-8.x-x86_64/jenkins centos-8.x-x86_64/generic rockylinux-8.x-x86_64/vgcn-bwcloud + rockylinux-8.x-x86_64/vgcn-bwcloud-gpu rockylinux-8.x-x86_64/jenkins rockylinux-8.x-x86_64/generic - centos-7.x-x86_64/vgcn-bwcloud - centos-7.x-x86_64/jenkins - centos-7.x-x86_64/generic + rockylinux-9.x-x86_64/vgcn-bwcloud + rockylinux-9.x-x86_64/vgcn-bwcloud-gpu + rockylinux-9.x-x86_64/jenkins + rockylinux-9.x-x86_64/generic ``` ## Dependencies @@ -97,13 +102,13 @@ We have listed the versions we use, but other versions may work. | Component | Version | |------------------------------------------------|------------| -| [Packer](https://www.packer.io/downloads.html) | 1.0.4 | -| Ansible | >= 2.4.3.0 | -| qemu | 2.5.0 | +| [Packer](https://www.packer.io/downloads.html) | 1.8.5 | +| Ansible (Community version number) | >= 6.7.0 | +| qemu | 7.0.0 | ## Building This Yourself -Create a python virtual environment using python 3.9 and install the requirements.txt -This ensures you get the correct ansible version, because some commands might fail otherwise. +Create a python virtual environment using python >= 3.9 and install the requirements.txt +This ensures you get the correct ansible and packer version, because some commands might fail otherwise. All of the images are designed to be as generic as possible so you can use them as-is. We will provide built images, but if you wish to build them yourself, From b72baa9c15d1a612dccdacf832c0150b334bed94 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:21:11 +0100 Subject: [PATCH 089/424] Delete centos-7.x-x86_64.json --- centos-7.x-x86_64.json | 46 ------------------------------------------ 1 file changed, 46 deletions(-) delete mode 100644 centos-7.x-x86_64.json diff --git a/centos-7.x-x86_64.json b/centos-7.x-x86_64.json deleted file mode 100644 index 47b32b43..00000000 --- a/centos-7.x-x86_64.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "variables": { - "iso_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-2003.iso", - "iso_checksum": "sha256:101bc813d2af9ccf534d112cbe8670e6d900425b297d1a4d2529c5ad5f226372", - "iso_checksum_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/sha256sum.txt", - "vm_name": "centos-7.x-x86_64", - "http_dir": "http", - "kickstart_path": "centos-7.x/anaconda-ks.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password": "password" - }, - "builders": [{ - "type": "qemu", - "accelerator": "kvm", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", - "vm_name": "{{ user `vm_name` }}", - "format": "qcow2", - "disk_size": "{{ user `disk_size` }}", - "net_device": "virtio-net", - "disk_interface": "virtio", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", - "boot_command": [ - "", - "linux inst.mbr biosdevname=0 net.ifnames=0 ", - "rootpw={{ user `ssh_password` }} ", - "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", - "" - ], - "boot_wait": "{{ user `boot_wait` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "qemuargs": [ - ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"] - ] - }], - "post-processors": [{ - "type": "manifest", - "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" - }] -} From d7dd71f436cc2ad18161d02b826ff72c3418c7c4 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:21:32 +0100 Subject: [PATCH 090/424] Delete http/centos-7.x directory --- http/centos-7.x/anaconda-ks.cfg | 55 --------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 http/centos-7.x/anaconda-ks.cfg diff --git a/http/centos-7.x/anaconda-ks.cfg b/http/centos-7.x/anaconda-ks.cfg deleted file mode 100644 index 7978dee5..00000000 --- a/http/centos-7.x/anaconda-ks.cfg +++ /dev/null @@ -1,55 +0,0 @@ -install -text -reboot -url --mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os -lang en_US.UTF-8 -keyboard --vckeymap=us --xlayouts='us' -timezone Europe/Berlin --isUtc --nontp -auth --enableshadow --passalgo=sha512 -clearpart --none --initlabel -bootloader --location=mbr --boot-drive=vda -part biosboot --fstype="biosboot" --ondisk=vda --size=1 -part / --fstype="xfs" --ondisk=vda --grow --label=system - -%packages -@^minimal -@core -kexec-tools -%end - -# small python script to extract the password from the kernel command line -# expects the password given as: rootpw= -%pre --interpreter=/usr/bin/python -import shlex, crypt -arg = 'rootpw=' -with open('/proc/cmdline', 'r') as f: - kcl = f.read().split() -# extract the password -passwords = [x[len(arg):] for x in kcl if x.startswith(arg)] -if len(passwords) == 1: - kclpass = passwords[0] -# TODO sane fallbacks. This should work most of the time though :) -# generate SHA512 hash -hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512)) -with open('/tmp/setup-root-pass', 'w') as f: - f.write('rootpw --iscrypted ' + hash) -%end -# include the created password file -%include /tmp/setup-root-pass - -%post --erroronfail -yum -y update -yum -y install wget -yum -y install epel-release -yum -y install ansible -# allow root login for ansible -sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config - -ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Fri, 10 Feb 2023 10:21:53 +0100 Subject: [PATCH 091/424] Delete http/sl-6.9 directory --- http/sl-6.9/anaconda-ks.cfg | 51 ------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 http/sl-6.9/anaconda-ks.cfg diff --git a/http/sl-6.9/anaconda-ks.cfg b/http/sl-6.9/anaconda-ks.cfg deleted file mode 100644 index 824da44a..00000000 --- a/http/sl-6.9/anaconda-ks.cfg +++ /dev/null @@ -1,51 +0,0 @@ -# -install -url --url=http://ftp1.scientificlinux.org/linux/scientific/6.9/x86_64/os/ -lang en_US.UTF-8 -keyboard us -network --activate --bootproto=dhcp --device=eth0 --onboot=on --ipv6=auto -# small python script to extract the password from the kernel command line -# expects the password given as: rootpw= -%pre --interpreter=/usr/bin/python -import shlex, crypt -arg = 'rootpw=' -with open('/proc/cmdline', 'r') as f: - kcl = f.read().split() -# extract the password -passwords = [x[len(arg):] for x in kcl if x.startswith(arg)] -if len(passwords) == 1: - kclpass = passwords[0] -# TODO sane fallbacks. This should work most of the time though :) -# generate SHA512 hash -hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512)) -with open('/tmp/setup-root-pass', 'w') as f: - f.write('rootpw --iscrypted ' + hash) -%end -# include the created password file -%include /tmp/setup-root-pass -# -services --enabled ssh -# -reboot -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone --utc Europe/Berlin -bootloader --append=" sshd=1" --location=mbr --driveorder=sda -# -#autopart --type=plain --fstype=ext4 -zerombr -clearpart --drives=sda --all --initlabel -#part swap --fstype="swap" --ondisk=sda --size=1024 --label=swap -part / --fstype="ext4" --ondisk=sda --size=3072 --grow --label=SLX_SYS -# -repo --name "Scientific Linux" --baseurl=http://ftp1.scientificlinux.org/linux/scientific/6.9/x86_64/os/ --cost=100 -# -skipx -#sshpw --username=install DPmn$65! --plaintext --lock -# -%packages -@base -@compat-libraries -@core -%end From a4beb9fa58a89e3569feb2d0f049a7d5cedb09e7 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:22:04 +0100 Subject: [PATCH 092/424] Delete http/ubuntu-16.04 directory --- http/ubuntu-16.04/preseed.cfg | 54 ----------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 http/ubuntu-16.04/preseed.cfg diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg deleted file mode 100644 index d99a94af..00000000 --- a/http/ubuntu-16.04/preseed.cfg +++ /dev/null @@ -1,54 +0,0 @@ -d-i debian-installer/locale string en_US -d-i time/zone string UTC -d-i keyboard-configuration/xkb-keymap select de - -d-i mirror/country string de - -d-i partman-basicfilesystems/choose_label string gpt -d-i partman-basicfilesystems/default_label string gpt -d-i partman-basicfilesystems/no_swap boolean false -d-i partman-partitioning/choose_label string gpt -d-i partman-partitioning/default_label string gpt -d-i partman/choose_label string gpt -d-i partman/default_label string gpt -d-i partman-auto/method string regular -d-i partman-auto/expert_recipe string \ - scheme :: \ - 32 32 32 free \ - $gptonly{ } \ - $primary{ } \ - $bios_boot{ } \ - method{ biosgrub } . \ - 1 0 -1 ext4 \ - $gptonly{ } \ - $primary{ } \ - method{ format } \ - format{ } \ - use_filesystem{ } \ - filesystem{ xfs } \ - label{ SLX_SYS } \ - mountpoint{ / } . -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -d-i base-installer/excludes string laptop-detect -d-i passwd/make-user boolean false -d-i passwd/root-login boolean true -d-i user-setup/allow-password-weak boolean true - -## install base packages ## -d-i pkgsel/include string curl openssh-server ansible -d-i pkgsel/language-packs multiselect de, en -d-i preseed/early_command string \ - mkdir -p /usr/lib/post-base-installer.d && \ - echo "sed -i -e 's/^in-target.*tasksel.*/#\\0/' /var/lib/dpkg/info/pkgsel.postinst" > /usr/lib/post-base-installer.d/90skip-tasksel && \ - chmod +x /usr/lib/post-base-installer.d/90skip-tasksel - -d-i preseed/late_command string \ - in-target sed -i 's,^PermitRootLogin.*,PermitRootLogin yes,' /etc/ssh/sshd_config ; \ - in-target apt-get update ; \ - in-target apt-get -y upgrade - -d-i finish-install/reboot_in_progress note From 1eb62ce9fc9aade59bd987ecd7cf853843aeb5e0 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:56:19 +0100 Subject: [PATCH 093/424] Update README.md --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b619411f..f152cd24 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ Development happens into the __dev__ branch, images are built from __main__ bran ## Makefile We include a makefile that should build the images, running `make` will inform you of the available targets: -Please make sure to build the rockylinux-9.x-86_64/vgcn-bwcloud(-gpu)-**external** as last step. ```console $ make @@ -95,7 +94,15 @@ Provisioning: rockylinux-9.x-x86_64/jenkins rockylinux-9.x-x86_64/generic ``` - +To build the VGCN-bwcloud Image with Rocky 9, execute the following steps: +```bash +make rockylinux-9.x-x86_64/base +make rockylinux-9.x-x86_64/vgcn-bwcloud +make rockylinux-9.x-x86_64/vgcn-bwcloud-external +``` +```diff +! Please make sure to build the rockylinux-9.x-86_64/vgcn-bwcloud(-gpu)-external as last step. The image does not work as expected otherwise. +``` ## Dependencies We have listed the versions we use, but other versions may work. From 43b89b1944117fc46b33136d3bd695752262be67 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 16 Feb 2023 12:58:23 +0100 Subject: [PATCH 094/424] change host url --- ansible-roles/secret_group_vars/internal.yml | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible-roles/secret_group_vars/internal.yml index 5b33888c..444bc198 100644 --- a/ansible-roles/secret_group_vars/internal.yml +++ b/ansible-roles/secret_group_vars/internal.yml @@ -1,13 +1,13 @@ $ANSIBLE_VAULT;1.1;AES256 -31306439663937383830663838653963623331666136333366336561376531316233336234616239 -6265353732363630336438343762656635653563666337340a636530393564353532623366343366 -63646135303233663863613838313963616537323061373534363037343639353132356236373637 -3330646132383339660a353031356462613663386262343730396665323466333931613731623837 -62643939366664626561396262666266343230353538313537356239623539333337653331313634 -39306639363666663765383032653765646531653733303432656537623937666538616332626435 -35313466626261346431663766636163346434393666373462353436343735313532363930343636 -30666333663662373434613163316564623261306263656630653965333736643061666666383764 -65356434656131626534343537323666373961393639313535336631633166303462663865326436 -39313864643565363930323930623865313533313663356538306236663135353630626334666136 -37633134376364303266306163623439396439666439316438613232656637643862313464306137 -64333938323730303036 +38316234373534333263376332303339653939653635386165376137626462653035396163623630 +3766336361366634376263393536613565316238663139630a323461383661623366643665623334 +39636664333631343061383361386364343362663165356435623261636364646461646330313534 +3031633732346533620a326264393965653566323331396538376432373361383962363434613131 +63616132653331343839373536353632303039336335303133666664336431303937653263353537 +30303935663461313036636262313632653030373139623337633565663737613035373162333365 +65323534333730613766636339656365386233633934346164353864313063313361626365323063 +31363362643237376664636133666332343130393763323336326265633066386434356538323639 +33366438633837623035306561336466346465313233326531353935303565616465343036623466 +31356339663833653164646435616539643463366232633838356439616165663337333562666463 +36396139396338366365343637613337633531393833613236326134316239313662643562613266 +30616261313635393563 From 400a98a5460b30758c3ab4d6e4fe5cd524f4b876 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:09:40 +0100 Subject: [PATCH 095/424] open nfs port --- ansible-roles/cloudinit/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible-roles/cloudinit/tasks/main.yml b/ansible-roles/cloudinit/tasks/main.yml index 397b3c19..e1951c70 100644 --- a/ansible-roles/cloudinit/tasks/main.yml +++ b/ansible-roles/cloudinit/tasks/main.yml @@ -46,6 +46,8 @@ dest: /etc/cloud/cloud.cfg block: | runcmd: + - [ firewall-cmd, --permanent, --add-port=2049/tcp ] + - [ firewall-cmd, --reload ] - [ sh, -xc, "sed -i 's|nameserver 10.0.2.3||g' /etc/resolv.conf" ] - [ sh, -xc, "sed -i 's|localhost.localdomain|$(hostname -f)|g' /etc/telegraf/telegraf.conf" ] - systemctl restart telegraf From 37b5c399442522843f712fb295f76d4200596955 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:48:29 +0100 Subject: [PATCH 096/424] add firewall rules --- ansible-roles/setup-vgcn-bwcloud.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 313571e6..17e3d739 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -60,6 +60,16 @@ group: root mode: 0755 post_tasks: + - name: Add firewall rules for NFS + ansible.posix.firewalld: + service: "{{ item }}" + state: enabled + permanent: true + immediate: true + with_items: + - nfs + - rpc-bind + - mountd - ansible.builtin.user: name: galaxy groups: condor,docker From bb2ae445fbd5282d00c418ccc3ae03f1cbc0d202 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:55:15 +0100 Subject: [PATCH 097/424] add firewall rule nfs --- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index b3102237..5a03413b 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -60,6 +60,20 @@ group: root mode: 0755 post_tasks: + - name: Add firewall rules for NFS + ansible.posix.firewalld: + service: "{{ item }}" + state: enabled + permanent: true + immediate: true + with_items: + - nfs + - rpc-bind + - mountd + - name: Restart Autofs + ansible.builtin.service: + name: autofs + state: restarted - name: galaxy account group ansible.builtin.group: gid: "{{ galaxy_gid }}" From b6fc1dd4743fbaa79ceaf3963633e0b2232c0e2e Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:55:41 +0100 Subject: [PATCH 098/424] add restart --- ansible-roles/setup-vgcn-bwcloud.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 17e3d739..f30f9a86 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -70,6 +70,10 @@ - nfs - rpc-bind - mountd + - name: Restart Autofs + ansible.builtin.service: + name: autofs + state: restarted - ansible.builtin.user: name: galaxy groups: condor,docker From e72bd41cd0d592ab2c5ab317e43a4cee0c857419 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:56:19 +0100 Subject: [PATCH 099/424] update comments --- ansible-roles/setup-vgcn-bwcloud.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index f30f9a86..852de392 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -1,6 +1,6 @@ # Setup for Virtual Galaxy Compute Node -# This setup is valid for RHEL 8.x based systems. -# It has SELinux disabled and Meltdown, Spectre patches off +# This setup is valid for RHEL 9.x based systems. +# It has SELinux permissive and firewalld enabled --- - hosts: default vars_files: From e0d36d08062d9573a67d979111924328b3158433 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:56:46 +0100 Subject: [PATCH 100/424] now in ansible --- ansible-roles/cloudinit/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible-roles/cloudinit/tasks/main.yml b/ansible-roles/cloudinit/tasks/main.yml index e1951c70..397b3c19 100644 --- a/ansible-roles/cloudinit/tasks/main.yml +++ b/ansible-roles/cloudinit/tasks/main.yml @@ -46,8 +46,6 @@ dest: /etc/cloud/cloud.cfg block: | runcmd: - - [ firewall-cmd, --permanent, --add-port=2049/tcp ] - - [ firewall-cmd, --reload ] - [ sh, -xc, "sed -i 's|nameserver 10.0.2.3||g' /etc/resolv.conf" ] - [ sh, -xc, "sed -i 's|localhost.localdomain|$(hostname -f)|g' /etc/telegraf/telegraf.conf" ] - systemctl restart telegraf From 1a1df01ec8f382bd723de75fb1a2bf00c21796ba Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Thu, 16 Mar 2023 10:44:01 +0100 Subject: [PATCH 101/424] =?UTF-8?q?bump=20pulsar=200.14.13=20=E2=86=92=200?= =?UTF-8?q?.14.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible-roles/group_vars/pulsar.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible-roles/group_vars/pulsar.yml index 682a59f1..64df445e 100644 --- a/ansible-roles/group_vars/pulsar.yml +++ b/ansible-roles/group_vars/pulsar.yml @@ -1,5 +1,5 @@ pulsar_package_name: pulsar-app -pulsar_package_version: 0.14.13 +pulsar_package_version: 0.14.15 pulsar_virtualenv_command: "python -m venv" pulsar_root: /opt/pulsar @@ -40,4 +40,4 @@ pulsar_yaml_config: type: queued_condor test: submit_universe: vanilla - type: queued_condor \ No newline at end of file + type: queued_condor From 447f17b3e732d415e756d9637ff0edc6186adfeb Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:29:23 +0200 Subject: [PATCH 102/424] =?UTF-8?q?bump=20pulsar=20=E2=86=920.15.0.dev1=20?= =?UTF-8?q?(latest=20dev=20version)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible-roles/group_vars/pulsar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible-roles/group_vars/pulsar.yml index 64df445e..797a98b4 100644 --- a/ansible-roles/group_vars/pulsar.yml +++ b/ansible-roles/group_vars/pulsar.yml @@ -1,5 +1,5 @@ pulsar_package_name: pulsar-app -pulsar_package_version: 0.14.15 +pulsar_package_version: 0.15.0.dev1 pulsar_virtualenv_command: "python -m venv" pulsar_root: /opt/pulsar From e48f7891ce2ec6282fb870c1ff3f5d6059eef2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 13 Apr 2023 16:33:11 +0200 Subject: [PATCH 103/424] Enable firewalld for generic images --- ansible-roles/setup-generic.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible-roles/setup-generic.yml b/ansible-roles/setup-generic.yml index 5c73afe1..0e9f58fa 100644 --- a/ansible-roles/setup-generic.yml +++ b/ansible-roles/setup-generic.yml @@ -22,11 +22,11 @@ ansible.posix.selinux: policy: targeted state: permissive - - name: Disable firewalld service + - name: Enable firewalld service ansible.builtin.systemd: name: firewalld - enabled: no - state: stopped + enabled: true + state: started roles: - role: usegalaxy_eu.handy.os_setup From d72557bf0f046c232f944374abecfbbf93690964 Mon Sep 17 00:00:00 2001 From: Sanjay Srikakulam Date: Wed, 19 Apr 2023 09:45:29 +0200 Subject: [PATCH 104/424] Move pulsar-app from dev to release version --- ansible-roles/group_vars/pulsar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible-roles/group_vars/pulsar.yml index 797a98b4..3e3dc66e 100644 --- a/ansible-roles/group_vars/pulsar.yml +++ b/ansible-roles/group_vars/pulsar.yml @@ -1,5 +1,5 @@ pulsar_package_name: pulsar-app -pulsar_package_version: 0.15.0.dev1 +pulsar_package_version: 0.15.1 pulsar_virtualenv_command: "python -m venv" pulsar_root: /opt/pulsar From b0bc98a0f6781915df5c546c72568286bf3976ff Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:53:37 +0200 Subject: [PATCH 105/424] Update pulsar.yml --- ansible-roles/group_vars/pulsar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible-roles/group_vars/pulsar.yml index 3e3dc66e..e9324fde 100644 --- a/ansible-roles/group_vars/pulsar.yml +++ b/ansible-roles/group_vars/pulsar.yml @@ -1,5 +1,5 @@ pulsar_package_name: pulsar-app -pulsar_package_version: 0.15.1 +pulsar_package_version: 0.15.2.dev1 pulsar_virtualenv_command: "python -m venv" pulsar_root: /opt/pulsar From 91406e1eaa9b38e789d8e87914fc4baeccc0d1cd Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 2 May 2023 11:48:08 +0200 Subject: [PATCH 106/424] switch to cgroups v1 --- http/rockylinux-9.x/anaconda-ks.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 3478b17f..ad1aad98 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -50,6 +50,10 @@ yum -y install ansible ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Tue, 2 May 2023 11:49:02 +0200 Subject: [PATCH 107/424] update-grub --- http/rockylinux-9.x/anaconda-ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index ad1aad98..30e0c200 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -53,6 +53,7 @@ cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Tue, 2 May 2023 13:49:32 +0200 Subject: [PATCH 108/424] update comment --- http/rockylinux-9.x/anaconda-ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 30e0c200..5c1e4b11 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -51,7 +51,7 @@ yum -y install ansible ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Thu, 4 May 2023 15:33:29 +0200 Subject: [PATCH 109/424] Update anaconda-ks.cfg --- http/rockylinux-9.x/anaconda-ks.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 5c1e4b11..475c3c13 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -52,8 +52,9 @@ ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Fri, 5 May 2023 10:58:37 +0200 Subject: [PATCH 110/424] Update anaconda-ks.cfg --- http/rockylinux-9.x/anaconda-ks.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 475c3c13..21c9c800 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -52,7 +52,8 @@ ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Fri, 5 May 2023 13:25:51 +0200 Subject: [PATCH 111/424] add vacuum cron --- ansible-roles/group_vars/all.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 7660842f..87673795 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -113,6 +113,10 @@ ansible_root_cron: minute: "{{ 60 | random }}" hour: "{{ 5 | random }}" job: "/usr/bin/docker-stop-1M" + - name: "Vacuum logs older than 7 days" + minute: "{{ 15 | random }}" + hour: "{{ 2 | random }}" + job: '/usr/bin/journalctl --vacuum-time="7 days"' ## packages software_groups_to_install: From 11df762978f083aa6e778cadd2e47db053966a40 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 5 May 2023 13:28:04 +0200 Subject: [PATCH 112/424] bump handy --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index de433891..a7898a09 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: usegalaxy_eu.handy - version: 2.11.1 + version: 2.2.0 source: https://galaxy.ansible.com - name: ansible.posix version: 1.5.1 From 6d1facc9c165c9e44e7d31420d11daa6d5db67b8 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 5 May 2023 13:51:39 +0200 Subject: [PATCH 113/424] use grubby --- http/rockylinux-9.x/anaconda-ks.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 21c9c800..10307ef7 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -52,10 +52,7 @@ ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Mon, 8 May 2023 16:40:14 +0200 Subject: [PATCH 114/424] once a week --- ansible-roles/group_vars/all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/group_vars/all.yml b/ansible-roles/group_vars/all.yml index 87673795..46907db3 100644 --- a/ansible-roles/group_vars/all.yml +++ b/ansible-roles/group_vars/all.yml @@ -114,6 +114,7 @@ ansible_root_cron: hour: "{{ 5 | random }}" job: "/usr/bin/docker-stop-1M" - name: "Vacuum logs older than 7 days" + weekday: "{{ 7 | random }}" minute: "{{ 15 | random }}" hour: "{{ 2 | random }}" job: '/usr/bin/journalctl --vacuum-time="7 days"' From 8a1eb29bb25e8649bf1456f63cb07986e91b0d9d Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Fri, 12 May 2023 09:19:26 +0200 Subject: [PATCH 115/424] cgroups v1 make condor fail --- http/rockylinux-9.x/anaconda-ks.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/http/rockylinux-9.x/anaconda-ks.cfg index 10307ef7..87828b29 100644 --- a/http/rockylinux-9.x/anaconda-ks.cfg +++ b/http/rockylinux-9.x/anaconda-ks.cfg @@ -51,9 +51,6 @@ yum -y install ansible ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules cat > /etc/sysconfig/network-scripts/ifcfg-eth0 < Date: Thu, 1 Jun 2023 10:41:12 +0200 Subject: [PATCH 116/424] add alma packer recipe --- almacloud-8.x-x86_64.json | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 almacloud-8.x-x86_64.json diff --git a/almacloud-8.x-x86_64.json b/almacloud-8.x-x86_64.json new file mode 100644 index 00000000..c118bc69 --- /dev/null +++ b/almacloud-8.x-x86_64.json @@ -0,0 +1,59 @@ +{ + "variables": { + "iso_url": "https://mirror.hs-esslingen.de/Mirrors/almalinux/8/isos/x86_64/AlmaLinux-8-latest-x86_64-boot.iso", + "iso_checksum": "sha256:016e59963c2c3bd4c99c18ac957573968e23da51131104568fbf389b11df3e05", + "iso_checksum_url": "https://mirror.hs-esslingen.de/Mirrors/almalinux/8/cloud/x86_64/images/CHECKSUM", + "vm_name": "almacloud-8.x-x86_64", + "http_dir": "http", + "kickstart_path": "almacloud-8.x/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "password" + }, + "builders": [ + { + "type": "qemu", + "accelerator": "kvm", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "output_directory": "output-{{ user `vm_name` }}-{{ build_type }}", + "vm_name": "{{ user `vm_name` }}", + "format": "qcow2", + "disk_size": "10G", + "disk_interface": "virtio-scsi", + "disk_cache": "unsafe", + "disk_discard": "unmap", + "disk_detect_zeroes": "unmap", + "disk_compression": true, + "net_device": "virtio-net", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "boot_wait": "10s", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "{{ user `shutdown_command` }}", + "qemuargs": [ + [ + "-m", + "{{ user `memory` }}" + ], + [ + "-smp", + "{{ user `cpus` }}" + ] + ], + "boot_command": [ + "", + "inst.text net.ifnames=0 inst.gpt", + " inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", + "" + ] + } + ], + "post-processors": [ + { + "type": "manifest", + "output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json" + } + ] +} \ No newline at end of file From 4f605468d44096e46a51c62e67da356e564a6e4b Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 1 Jun 2023 10:43:11 +0200 Subject: [PATCH 117/424] increase disk to 10G --- base.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base.json b/base.json index 69486fe3..0a9e5079 100644 --- a/base.json +++ b/base.json @@ -1,9 +1,9 @@ { "cpus": "2", - "boot_wait": "15s", - "disk_size": "6000", + "boot_wait": "10s", + "disk_size": "10G", "headless": "true", "memory": "2048", "ssh_timeout": "600m", "ssh_username": "root" -} +} \ No newline at end of file From 8001b312e4ae762996c3dc48157fa7aa152f478e Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 1 Jun 2023 10:51:02 +0200 Subject: [PATCH 118/424] add packages --- ansible-roles/setup-vgcn-bwcloud.yml | 47 +++++++++++++++++----------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 852de392..e4a3ce66 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -2,37 +2,49 @@ # This setup is valid for RHEL 9.x based systems. # It has SELinux permissive and firewalld enabled --- -- hosts: default +- name: Setup VGCN compute node + hosts: default vars_files: - "group_vars/all.yml" - "group_vars/grub.yml" - "group_vars/pulsar.yml" - "group_vars/condor.yml" pre_tasks: - - name: system update + - name: System update ansible.builtin.dnf: name: "*" state: latest exclude: condor* - name: Install Pulsar dependencies - package: + ansible.builtin.package: name: - git - virtualenv - python3 + - python3-pycurl + - yum + - openssl + - openssl-devel + state: present become: true when: ansible_os_family == 'Debian' - name: Install Pulsar dependencies - package: + ansible.builtin.package: name: - git - - python36-virtualenv + - python3-virtualenv - python3 + - python3-pycurl + - yum + - libcurl-devel + - python3-libs + - openssl + - openssl-devel state: present become: true when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 8 - name: Install Pulsar dependencies - package: + ansible.builtin.package: name: - git - libcurl-devel @@ -41,7 +53,7 @@ become: true when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int == 9 - name: Set default version of Python - ansible.builtin.alternatives: + community.general.alternatives: name: python path: /usr/bin/python3 link: /usr/bin/python @@ -58,7 +70,7 @@ dest: /usr/bin/docker-stop-1M owner: root group: root - mode: 0755 + mode: '0755' post_tasks: - name: Add firewall rules for NFS ansible.posix.firewalld: @@ -74,11 +86,13 @@ ansible.builtin.service: name: autofs state: restarted - - ansible.builtin.user: + - name: Add groups to Galaxy user + ansible.builtin.user: name: galaxy groups: condor,docker - append: yes - - ansible.builtin.dnf: + append: true + - name: Remove packages + ansible.builtin.dnf: name: "{{ packages }}" state: absent vars: @@ -86,9 +100,9 @@ - gcc - libcurl-devel - openssl-devel - become: yes + become: true - name: Ensure Docker directory extists - file: + ansible.builtin.file: state: directory path: /etc/docker mode: '0755' @@ -109,7 +123,7 @@ dest: /bin/iamalive owner: telegraf group: telegraf - mode: 0755 + mode: '0755' roles: - geerlingguy.repo-epel # Install EPEL - role: usegalaxy_eu.handy.os_setup @@ -127,13 +141,10 @@ - usegalaxy-eu.autofs - usegalaxy-eu.dynmotd - - geerlingguy.java - geerlingguy.docker - - influxdata.chrony - dj-wasabi.telegraf - - galaxyproject.cvmfs - galaxyproject.pulsar - usegalaxy-eu.logrotate @@ -151,7 +162,7 @@ # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit - role: usegalaxy-eu.fslimit - become: yes + become: true vars: ulimit_fsize_unit: "condor.service" ulimit_fsize_soft: 268435456000 From 9f51bc3fafc9fcb5f76018db461db6a3895c0514 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 1 Jun 2023 11:59:56 +0200 Subject: [PATCH 119/424] change versions --- requirements.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index a7898a09..3b65555d 100644 --- a/requirements.yml +++ b/requirements.yml @@ -14,7 +14,7 @@ roles: - src: usegalaxy_eu.cuda version: 1.1.0 - src: usegalaxy_eu.nvidia_container - version: 1.1.0 + version: 1.2.0 - src: geerlingguy.docker version: 6.1.0 - src: https://github.com/usegalaxy-eu/ansible-chrony @@ -27,7 +27,7 @@ roles: version: 0.0.1 - name: usegalaxy_eu.htcondor - version: 2.1.0 + version: 2.2.0 - src: geerlingguy.repo-epel version: 3.1.0 - src: geerlingguy.java @@ -43,5 +43,5 @@ roles: - name: usegalaxy-eu.fslimit src: https://github.com/usegalaxy-eu/ansible-fslimit version: main - - name: dj-wasabi.telegraf - version: 0.14.0 + - name: usegalaxy-eu.telegraf + version: 0.14.1 From 7ede9e44bb879e1cab9936b5021410a485d4ff84 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Thu, 1 Jun 2023 12:08:14 +0200 Subject: [PATCH 120/424] add kickstart for alma --- http/almacloud-8.x/anaconda-ks.cfg | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 http/almacloud-8.x/anaconda-ks.cfg diff --git a/http/almacloud-8.x/anaconda-ks.cfg b/http/almacloud-8.x/anaconda-ks.cfg new file mode 100644 index 00000000..7220f2e5 --- /dev/null +++ b/http/almacloud-8.x/anaconda-ks.cfg @@ -0,0 +1,59 @@ +# AlmaLinux 8 kickstart file for Generic Cloud (OpenStack) image + +url --url https://mirror.hs-esslingen.de/Mirrors/almalinux/8/BaseOS/x86_64/kickstart/ +repo --name=BaseOS --baseurl=https://mirror.hs-esslingen.de/Mirrors/almalinux/8/BaseOS/x86_64/os/ +repo --name=AppStream --baseurl=https://mirror.hs-esslingen.de/Mirrors/almalinux/8/AppStream/x86_64/os/ +repo --name=epel --baseurl=http://ftp.uni-stuttgart.de/epel/8/Everything/x86_64/ + +text +skipx +eula --agreed +firstboot --disabled + +lang en_US.UTF-8 +keyboard us +timezone UTC --isUtc + +network --bootproto=dhcp +firewall --enabled --service=ssh +services --disabled="kdump" --enabled="chronyd,rsyslog,sshd" +selinux --enforcing + +# TODO: remove "console=tty0" from here +bootloader --append="console=ttyS0,115200n8 console=tty0 crashkernel=auto net.ifnames=0 no_timer_check" --location=mbr --timeout=1 +zerombr +clearpart --all --initlabel +reqpart +part / --fstype="xfs" --size=8000 + +rootpw --plaintext password + +reboot --eject + + +%packages +@core +-biosdevname +-open-vm-tools +-plymouth +-dnf-plugin-spacewalk +-rhn* +-iprutils +-iwl*-firmware +-epel-release +-ansible +%end + + +# disable kdump service +%addon com_redhat_kdump --disable +%end + + +%post +/usr/sbin/rhnreg_ks --activationkey=$ACTIVATIONKEY +rpm --import /usr/share/rhn/RPM-GPG-KEY +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release-2 +%end From 9ea2f6925a8bbae782b92ae43922c2b5c02b0a25 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Mon, 19 Jun 2023 09:42:48 +0200 Subject: [PATCH 121/424] add core limit --- ansible-roles/internal.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible-roles/internal.yml b/ansible-roles/internal.yml index 80ea717b..a13d6da0 100644 --- a/ansible-roles/internal.yml +++ b/ansible-roles/internal.yml @@ -22,6 +22,12 @@ - rsa - ecdsa - ed25519 + - name: Add core limit + community.general.pam_limits: + domain: galaxy + limit_type: hard + limit_item: core + value: 0 roles: - usegalaxy_eu.htcondor - lock-root From 3cef11d6989686f6bb00afa0d57b0cb0539bb15f Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 20 Jun 2023 16:45:25 +0200 Subject: [PATCH 122/424] fix telegraf --- requirements.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.yml b/requirements.yml index 3b65555d..7e1cd381 100644 --- a/requirements.yml +++ b/requirements.yml @@ -44,4 +44,6 @@ roles: src: https://github.com/usegalaxy-eu/ansible-fslimit version: main - name: usegalaxy-eu.telegraf + src: https://github.com/usegalaxy-eu/ansible-telegraf version: 0.14.1 + From 0b8a9a59f0fb62c344c78dc65853c8dd8d72e024 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:36:45 +0200 Subject: [PATCH 123/424] using our own fork --- ansible-roles/setup-vgcn-bwcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index e4a3ce66..f10765fc 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -144,7 +144,7 @@ - geerlingguy.java - geerlingguy.docker - influxdata.chrony - - dj-wasabi.telegraf + - usegalaxy_eu.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar - usegalaxy-eu.logrotate From 01df96d9582c2bf90005da05c500350d3c7df069 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:37:53 +0200 Subject: [PATCH 124/424] the one with a - --- ansible-roles/setup-vgcn-bwcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index f10765fc..91484bd8 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -144,7 +144,7 @@ - geerlingguy.java - geerlingguy.docker - influxdata.chrony - - usegalaxy_eu.telegraf + - usegalaxy-eu.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar - usegalaxy-eu.logrotate From d599633aa9d91cf453028c0a7c646d7a5fe4d5e6 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:11:41 +0200 Subject: [PATCH 125/424] use pinned condor for RHEL < 9 --- ansible-roles/group_vars/condor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/group_vars/condor.yml b/ansible-roles/group_vars/condor.yml index 6e049257..471d4920 100644 --- a/ansible-roles/group_vars/condor.yml +++ b/ansible-roles/group_vars/condor.yml @@ -1,2 +1,3 @@ --- +condor_package_label: "{{ condor-all-8.8.15 if ansible_facts['distribution_major_version']|int < 9 | default(omit) }}" condor_copy_template: false From 7de384972e97f1a40ed61b5a3dbe870b0e4eda7b Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:08:55 +0200 Subject: [PATCH 126/424] use condor vars --- ansible-roles/internal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-roles/internal.yml b/ansible-roles/internal.yml index a13d6da0..d05138bc 100644 --- a/ansible-roles/internal.yml +++ b/ansible-roles/internal.yml @@ -4,6 +4,7 @@ internal: true vars_files: - "group_vars/all.yml" + - "group_vars/condor.yml" - "secret_group_vars/internal.yml" pre_tasks: - name: Copy server key into VM temporarily From 0c6cbadc563983c3e10ca1cdc1293081415c48f3 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:36:51 +0200 Subject: [PATCH 127/424] open port for HTCondor --- ansible-roles/setup-vgcn-bwcloud.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 91484bd8..4effdffa 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -82,6 +82,13 @@ - nfs - rpc-bind - mountd + - name: Add firewall rules for NFS + - name: Open Port for HTCondor + ansible.posix.firewalld: + port: 9618/tcp + state: enabled + permanent: true + immediate: true - name: Restart Autofs ansible.builtin.service: name: autofs From d0c669a412f47e48d9cc19abd2b93ac7bb188ae5 Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 4 Jul 2023 11:23:05 +0200 Subject: [PATCH 128/424] fix typo --- ansible-roles/setup-vgcn-bwcloud.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 4effdffa..9425c629 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -82,7 +82,6 @@ - nfs - rpc-bind - mountd - - name: Add firewall rules for NFS - name: Open Port for HTCondor ansible.posix.firewalld: port: 9618/tcp From 360133a3a347f06f232748a05c2baae4532d661c Mon Sep 17 00:00:00 2001 From: Mira Kuntz Date: Tue, 4 Jul 2023 13:06:01 +0200 Subject: [PATCH 129/424] replace dj-wasabi role with our fork --- ansible-roles/setup-generic.yml | 2 +- ansible-roles/setup-jenkins.yml | 3 +-- ansible-roles/setup-vgcn-bwcloud-gpu.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ansible-roles/setup-generic.yml b/ansible-roles/setup-generic.yml index 0e9f58fa..44a2d581 100644 --- a/ansible-roles/setup-generic.yml +++ b/ansible-roles/setup-generic.yml @@ -40,4 +40,4 @@ - usegalaxy-eu.autoupdates # keep all of our packages up to date - usegalaxy-eu.dynmotd - influxdata.chrony - - dj-wasabi.telegraf + - usegalaxy-eu.telegraf diff --git a/ansible-roles/setup-jenkins.yml b/ansible-roles/setup-jenkins.yml index 321dcb0a..daab399d 100644 --- a/ansible-roles/setup-jenkins.yml +++ b/ansible-roles/setup-jenkins.yml @@ -97,5 +97,4 @@ - geerlingguy.java - geerlingguy.docker - influxdata.chrony - - dj-wasabi.telegraf - + - usegalaxy-eu.telegraf diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml index 5a03413b..b46dce69 100644 --- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml +++ b/ansible-roles/setup-vgcn-bwcloud-gpu.yml @@ -144,7 +144,7 @@ - geerlingguy.docker - influxdata.chrony - - dj-wasabi.telegraf + - usegalaxy-eu.telegraf - galaxyproject.cvmfs - galaxyproject.pulsar From 0f3dd74b8f951491550854bbf11a0c7a2bc6af48 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:22:21 +0200 Subject: [PATCH 130/424] bump handy version --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 7e1cd381..50fc4d55 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: usegalaxy_eu.handy - version: 2.2.0 + version: 3.0.1 source: https://galaxy.ansible.com - name: ansible.posix version: 1.5.1 From e3937ea797ed223d367e059009829a404250cc50 Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:30:27 +0200 Subject: [PATCH 131/424] Update condor.yml --- ansible-roles/group_vars/condor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-roles/group_vars/condor.yml b/ansible-roles/group_vars/condor.yml index 471d4920..85c46556 100644 --- a/ansible-roles/group_vars/condor.yml +++ b/ansible-roles/group_vars/condor.yml @@ -1,3 +1,3 @@ --- -condor_package_label: "{{ condor-all-8.8.15 if ansible_facts['distribution_major_version']|int < 9 | default(omit) }}" +condor_package_label: "{{ 'condor-all-8.8.15' if ansible_facts['distribution_major_version']|int < 9 | default(omit) }}" condor_copy_template: false From 7bd6a31181d319e351d4e6f4374d1b934e13d5ce Mon Sep 17 00:00:00 2001 From: Mira <86979912+mira-miracoli@users.noreply.github.com> Date: Wed, 5 Jul 2023 16:30:36 +0200 Subject: [PATCH 132/424] add missing packages --- ansible-roles/setup-vgcn-bwcloud.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml index 9425c629..c3464264 100644 --- a/ansible-roles/setup-vgcn-bwcloud.yml +++ b/ansible-roles/setup-vgcn-bwcloud.yml @@ -15,19 +15,6 @@ name: "*" state: latest exclude: condor* - - name: Install Pulsar dependencies - ansible.builtin.package: - name: - - git - - virtualenv - - python3 - - python3-pycurl - - yum - - openssl - - openssl-devel - state: present - become: true - when: ansible_os_family == 'Debian' - name: Install Pulsar dependencies ansible.builtin.package: name: @@ -35,9 +22,14 @@ - python3-virtualenv - python3 - python3-pycurl + - python3-devel - yum + - gcc + - curl - libcurl-devel - python3-libs + - python38 + - python38-devel - openssl - openssl-devel state: present From 0dd9d366f264d452c2e2b50294c1ba3e46d3ea44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:54:45 +0200 Subject: [PATCH 133/424] Remove unused `y-yu.texlive` Ansible role --- ansible-roles/y-yu.texlive/.gitignore | 1 - ansible-roles/y-yu.texlive/.travis.yml | 19 ------ ansible-roles/y-yu.texlive/LICENSE | 19 ------ ansible-roles/y-yu.texlive/README.md | 66 ------------------- ansible-roles/y-yu.texlive/defaults/main.yml | 10 --- .../y-yu.texlive/meta/.galaxy_install_info | 1 - ansible-roles/y-yu.texlive/meta/main.yml | 18 ----- ansible-roles/y-yu.texlive/tasks/main.yml | 43 ------------ .../templates/install-tl.profile.j2 | 10 --- ansible-roles/y-yu.texlive/tests/inventory | 1 - ansible-roles/y-yu.texlive/tests/test.yml | 7 -- ansible-roles/y-yu.texlive/tests/vars.yml | 4 -- ansible-roles/y-yu.texlive/vars/Darwin.yml | 1 - ansible-roles/y-yu.texlive/vars/Debian.yml | 1 - 14 files changed, 201 deletions(-) delete mode 100644 ansible-roles/y-yu.texlive/.gitignore delete mode 100644 ansible-roles/y-yu.texlive/.travis.yml delete mode 100644 ansible-roles/y-yu.texlive/LICENSE delete mode 100644 ansible-roles/y-yu.texlive/README.md delete mode 100644 ansible-roles/y-yu.texlive/defaults/main.yml delete mode 100644 ansible-roles/y-yu.texlive/meta/.galaxy_install_info delete mode 100644 ansible-roles/y-yu.texlive/meta/main.yml delete mode 100644 ansible-roles/y-yu.texlive/tasks/main.yml delete mode 100644 ansible-roles/y-yu.texlive/templates/install-tl.profile.j2 delete mode 100644 ansible-roles/y-yu.texlive/tests/inventory delete mode 100644 ansible-roles/y-yu.texlive/tests/test.yml delete mode 100644 ansible-roles/y-yu.texlive/tests/vars.yml delete mode 100644 ansible-roles/y-yu.texlive/vars/Darwin.yml delete mode 100644 ansible-roles/y-yu.texlive/vars/Debian.yml diff --git a/ansible-roles/y-yu.texlive/.gitignore b/ansible-roles/y-yu.texlive/.gitignore deleted file mode 100644 index 997ca2f8..00000000 --- a/ansible-roles/y-yu.texlive/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.vagrant \ No newline at end of file diff --git a/ansible-roles/y-yu.texlive/.travis.yml b/ansible-roles/y-yu.texlive/.travis.yml deleted file mode 100644 index 53778019..00000000 --- a/ansible-roles/y-yu.texlive/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -matrix: - include: - - os: osx - language: generic - - os: linux - language: python - dist: trusty - python: "2.7" -env: - - ANSIBLE_VERSION="2.3.2.0" -install: - - pip install ansible=="$ANSIBLE_VERSION" -before_script: - - ansible --version -script: - - ansible-playbook -i tests/inventory tests/test.yml --syntax-check - - ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/ansible-roles/y-yu.texlive/LICENSE b/ansible-roles/y-yu.texlive/LICENSE deleted file mode 100644 index 455abf81..00000000 --- a/ansible-roles/y-yu.texlive/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2017 Yuu YOSHIMURA - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/ansible-roles/y-yu.texlive/README.md b/ansible-roles/y-yu.texlive/README.md deleted file mode 100644 index ece511c1..00000000 --- a/ansible-roles/y-yu.texlive/README.md +++ /dev/null @@ -1,66 +0,0 @@ -TeXLive -========= - -[![Build Status](https://travis-ci.org/y-yu/ansible-texlive.svg?branch=master)](https://travis-ci.org/y-yu/ansible-texlive) - -TeXLive install role for Linux and macOS. - -## Install - -``` -$ ansible-galaxy install y-yu.texlive -``` - -## Requirements - -- Ansible 2.0 or higher -- rsync (if you want to install full) - -### Why does the role use rsync? - -TeXLive installer (`install-tl`) uses HTTP to pull CTAN packages by default. -But if the installer fails to download, it will start to download over. -Rsync can resume to download, so this role uses rsync if you want to install full packages. - -## Role Variables - -```yaml -# TeXLive install directory -texlive_directory: - /usr/local/texlive - -# TeXLive mirror -texlive_mirror: - http://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet - -# TeXLive rsync URL -# This is used if you want to install full TeXLive -texlive_rsync: - rsync://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet/ - -# TeXLive Scheme -# full > medium > small > basic -scheme: - small -``` - -## Dependencies - -None - -## Example Playbook - -```yaml -- hosts: all - become: yes - roles: - - texlive -``` - -## License - -MIT (See [LICENSE](https://github.com/y-yu/ansible-texlive/blob/master/LICENSE)) - -## Author Information - -Yuu YOSHIMURA diff --git a/ansible-roles/y-yu.texlive/defaults/main.yml b/ansible-roles/y-yu.texlive/defaults/main.yml deleted file mode 100644 index aedf855a..00000000 --- a/ansible-roles/y-yu.texlive/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ -texlive_directory: - /usr/local/texlive - -texlive_mirror: - http://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet -texlive_rsync: - rsync://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet/ - -scheme: - small diff --git a/ansible-roles/y-yu.texlive/meta/.galaxy_install_info b/ansible-roles/y-yu.texlive/meta/.galaxy_install_info deleted file mode 100644 index c7b99086..00000000 --- a/ansible-roles/y-yu.texlive/meta/.galaxy_install_info +++ /dev/null @@ -1 +0,0 @@ -{install_date: 'Wed Oct 17 13:54:58 2018', version: master} diff --git a/ansible-roles/y-yu.texlive/meta/main.yml b/ansible-roles/y-yu.texlive/meta/main.yml deleted file mode 100644 index 8e9d7448..00000000 --- a/ansible-roles/y-yu.texlive/meta/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -galaxy_info: - author: Yuu YOSHIMURA - description: TeXLive Install Role for Linux and macOS - license: MIT - min_ansible_version: 2.0 - platforms: - - name: MacOSX - versions: - - all - - name: Ubuntu - versions: - - trusty - galaxy_tags: - - texlive - - tex - - latex - - system -dependencies: [] diff --git a/ansible-roles/y-yu.texlive/tasks/main.yml b/ansible-roles/y-yu.texlive/tasks/main.yml deleted file mode 100644 index 0a4a216a..00000000 --- a/ansible-roles/y-yu.texlive/tasks/main.yml +++ /dev/null @@ -1,43 +0,0 @@ -#- name: "Include OS specific variables" - #include_vars: "{{ ansible_os_family }}.yml" - -- name: "Download TeXLive Installer" - get_url: - url: "{{ texlive_mirror }}/install-tl-unx.tar.gz" - dest: /tmp/install-tl-unx.tar.gz - when: scheme != "full" - -- name: "Unarchive TeXLive Installer" - shell: tar -xf /tmp/install-tl-unx.tar.gz -C /tmp - when: scheme != "full" - -- name: "Rsync TeXLive Repository" - shell: "rsync -a --no-perms --no-owner --no-group --delete --exclude=mactex* --partial {{ texlive_rsync }} /tmp/tlnet" - when: scheme == "full" and texlive_rsync is defined - -- name: "Create Profile" - template: - src: install-tl.profile.j2 - dest: /tmp/install-tl.profile - -- name: "Make {{ texlive_directory }} Directory" - file: - path: "{{ texlive_directory }}" - state: directory - -- name: "Install TeXLive from Local" - shell: cd /tmp/tlnet && chmod +x install-tl && ./install-tl -profile /tmp/install-tl.profile -repository /tmp/tlnet - when: scheme == "full" - -- name: "Install TeXLive from Remote" - shell: "cd /tmp/install-tl-* && ./install-tl -profile /tmp/install-tl.profile -repository {{ texlive_mirror }}" - when: scheme != "full" - -- name: "Show LaTeX Version" - shell: latex -v - register: latex - environment: - PATH: "{{ texlive_directory }}/bin/x86_64-linux:{{ ansible_env.PATH }}" - -- debug: msg="{{ latex.stdout }}" - diff --git a/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2 b/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2 deleted file mode 100644 index f9dee120..00000000 --- a/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -selected_scheme scheme-{{ scheme }} -TEXDIR {{ texlive_directory }} -TEXMFSYSCONFIG {{ texlive_directory }}/texmf-config -TEXMFSYSVAR {{ texlive_directory }}/texmf-var -TEXMFHOME ~/texlive/texmf -TEXMFVAR ~/texlive/texmf-var -TEXMFCONFIG ~/texlive/texmf-config -TEXMFLOCAL ~/texlive/texmf-local -option_doc 0 -option_src 0 diff --git a/ansible-roles/y-yu.texlive/tests/inventory b/ansible-roles/y-yu.texlive/tests/inventory deleted file mode 100644 index 2fbb50c4..00000000 --- a/ansible-roles/y-yu.texlive/tests/inventory +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/ansible-roles/y-yu.texlive/tests/test.yml b/ansible-roles/y-yu.texlive/tests/test.yml deleted file mode 100644 index f93e1e54..00000000 --- a/ansible-roles/y-yu.texlive/tests/test.yml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: all - remote_user: root - become: yes - vars_files: - - ./vars.yml - roles: - - role: ../.. diff --git a/ansible-roles/y-yu.texlive/tests/vars.yml b/ansible-roles/y-yu.texlive/tests/vars.yml deleted file mode 100644 index dc3024dd..00000000 --- a/ansible-roles/y-yu.texlive/tests/vars.yml +++ /dev/null @@ -1,4 +0,0 @@ -texlive_mirror: - http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet -texlive_rsync: - rsync://mirror.jmu.edu/CTAN/systems/texlive/tlnet/ diff --git a/ansible-roles/y-yu.texlive/vars/Darwin.yml b/ansible-roles/y-yu.texlive/vars/Darwin.yml deleted file mode 100644 index bd10780b..00000000 --- a/ansible-roles/y-yu.texlive/vars/Darwin.yml +++ /dev/null @@ -1 +0,0 @@ -os: darwin diff --git a/ansible-roles/y-yu.texlive/vars/Debian.yml b/ansible-roles/y-yu.texlive/vars/Debian.yml deleted file mode 100644 index bdf46ff1..00000000 --- a/ansible-roles/y-yu.texlive/vars/Debian.yml +++ /dev/null @@ -1 +0,0 @@ -os: linux From d4a55bf43ab0864f2dcfeb56a05fe339dfe120c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:55:21 +0200 Subject: [PATCH 134/424] Remove unused `ssh-host-sign` Ansible role --- ansible-roles/ssh-host-sign/files/server_ca | 89 ------------------- .../ssh-host-sign/files/server_ca.pub | 1 - ansible-roles/ssh-host-sign/tasks/main.yml | 33 ------- 3 files changed, 123 deletions(-) delete mode 100644 ansible-roles/ssh-host-sign/files/server_ca delete mode 100644 ansible-roles/ssh-host-sign/files/server_ca.pub delete mode 100644 ansible-roles/ssh-host-sign/tasks/main.yml diff --git a/ansible-roles/ssh-host-sign/files/server_ca b/ansible-roles/ssh-host-sign/files/server_ca deleted file mode 100644 index 86dbb072..00000000 --- a/ansible-roles/ssh-host-sign/files/server_ca +++ /dev/null @@ -1,89 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -39306461356465646232356434303833396363393338303630616366386631333863333830373936 -3330323562373062323062656638316235656465623239650a393962653263663335373436353830 -65656135353831383432303563353864306232396535626563643866393434643464386637343930 -6365666230326635370a393362336666313839343665663062393537643966666261643362366639 -35303566343336663935306331643739353035626237323532633738663037396566326264643934 -34396133633166306135613463636637356637373730346164353834613062353631323162353437 -33663930343330663930306130633730653730333634366238343333663066376635363662623065 -30376637653462666531373561643530663439303135373663643531383263383837313265383135 -39363366373031356366613639643637343161303637653832633164613132626162303633633335 -30363964343935303561326332386161616466323062393865343166363034373463656161386665 -61333035633431623366376136666534343261323261326430613838313734366166613461323032 -66303430303337633065643433626131306137636165376534356363656535376332326536653839 -36383766303637393662393034343965613936643633326132333162383738306135646565343531 -66353435336538633134613162373561636365626533303665663430343261306335373831656339 -66376162616662383364353431663061383839363564333934313331616239616662346362326566 -35616466663433353532623036323732613666346439386339626462353962356663643539636232 -38616530353236373636353639326534306436616636663838613764626265383365303464333834 -35343961366437656363653537663739653064663462343537613361386235326638633061653037 -30316564373061366162633030323538343765316636366532663162333631306662323266656332 -33393233636632346434343935393539383565353432323862623366306264626336396332613738 -64323435333565643963626435636462656536666534613665336132353130393637656334303635 -33646266333265363832633866333765373638666437373163326433643666336630653864343162 -39356163646233356133363638613462346632306465613430623638376532383464303564386264 -62366239366339333438646533323335323566316135393861636531343035663063663338343032 -62623364383435366365313661316336323038393162616166663135333038656333323366363236 -37636461316261656465613161373335333163613561643965356262636464373532363532653638 -31393131303938656337383463323165303635373637646138656562386636646131626236356437 -31393966383961333733663438646535633933626336393363343635633639316266653238353430 -36316337656661316461636664356661396462633938346232313037323664343564393134383736 -63326336353034323363373465646433333562373135613163323431383531376134626166376366 -35656430343366306166376264366339326535326136333138326561343731623438653264356332 -39653262373033623935663030633336666336306636313534393331376437643064383433333132 -65323233623665303262363064306635346265306133323864626266363039333236353636323635 -39326363633434386439623566666562633136633438346237356533376262643535613734366332 -30336430393936316634333565663430333765626262636262336665613239316565646566306334 -61313362623032366337333865653837373136386532326534356434316533643961643737393838 -31646338323036363337313933323639336535633930643934623439323439653731356337373337 -30373538313735313735663835343335313333326361643133626134623339656165663263366230 -33656434346634316233616162613230323261366631343634666336323964623762346139653337 -35616439366434353732376431633431663339313063623266363561303533646465353964663664 -62393130333939393938313065383739636535663934333161356564386565366533663639363464 -33303064313434653063366633306430303531336665333162393561336638316231343966393063 -32353536646635336431656434643435636339333765613663356139336433633031303631613266 -33633037363566343464663634353539663532646464343930626465363833333135613139306432 -38303164626662636431363635633039323561396266306339623161393266316263386666303366 -37663031373863333661373636636630626265623038636432343163346136616539613165363364 -66356339346630393535656362393631323636613963653531303237306438373732616463356163 -63313033306634333737373630616534663635383038353236353735373665336262643830616262 -66613164396134656663306666623761393265653163656332343539353364626664383334656166 -39393132363534623236383130613861623761373732353738366433366238323963306134393133 -36343238633332653134363339313330336531613137613466663465626163346564363631613830 -30383135333936623735353133666131633065643065663965386130323735383430636233333461 -39366434313238663865613739376366666337656363323366313261646537373335653565363531 -30383837386264383338376364356434653261333231303138373837613431326439653335646566 -66383130623163303366653833313664373630326166373562613933336265356530653461373764 -33623031363539653431353731343637646662633736616232636535313665616235373839353361 -63396631373032303730396639666363653164633038636438376366316363316532613335336636 -62653764636235346539653364663234613230616564353266383766663739383739333963623535 -36653566303339356662643333366131396334353137623533633463383466306635346139366366 -33613534313830663837656330376531353261653735643134643735353130333330646138306535 -39613762346561383038356562623135626637646238303038613237303838373831303762326131 -32656630373163663361356139656231346261623532313630633734633262613635376538613230 -36306439613236343935623138626463396336623264663838623763633435656464323837326266 -36316363636431666134333361366634346433623265323761643638663263626632333238303836 -33383831356631643664353635613330366336353638643436623932333938356165613461333237 -61383135313538643934633663363338666236373736333966336632633461393562383539383766 -39353233626439663538363465373439616162393161393832636639323465666131336635653361 -30623738373435616665393834363332306537633137613631306130323633623062643932633636 -33333736323735313230663030343966373930306362323838636239386535343636366264356563 -65316138396665613932303731636630653232633866623433623830656235323365383339326337 -66616431316566376562376236663562616436303465366361373639306366643934313564623437 -62366337363863646664323832373832646639366165336466646238393932306665613931633263 -34653834663034386538373538373363366538363038616666306361666236653564633130373461 -62653539373761653730353336336262636636623162366365323565623766393864636463636264 -61303932383038313232376166356264663563333134666237616433323239633262663366643636 -38383238326636383963366263643830316337366133633137316463373164633236616132336561 -32346631393339363433643131653938626166313962303130356537373366343362386130333564 -34643763393935323235376362326632343265666235373262666563373230616630383362613035 -65646664643933366230313262373961353630383836383236386639616639616462386634646362 -61316434366165613934663137393633383132636435623439373736656536633364633837376166 -32306539636465626631626236383765643961333937393431653237333739386638663738343037 -31383136633832326434623063663637663937383361656537343933346634616231366337646465 -30633865316264373437356161313537663831343466636462376161383039633437643633343730 -32656661626234626630616638356338383562303566366266306131363761313966386364323131 -32636132613861376634333861373038323839616136356435643338343463346463663536376333 -39613139643930616333336438366566356333313933336165363339643131386663633565356530 -34643435316436303163366339353363656236613965386537666638616635613637623133363935 -36383663663536623438 diff --git a/ansible-roles/ssh-host-sign/files/server_ca.pub b/ansible-roles/ssh-host-sign/files/server_ca.pub deleted file mode 100644 index fb30aa98..00000000 --- a/ansible-roles/ssh-host-sign/files/server_ca.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQD6fG38uwFj91GSe6YnRnBuTjXWZN6Pck1JRCTWtufwKV0SZNczD+qUdnFfZrCx/wBVK8R6zL2VWS9hcFK1LuE8HK86f8qG/gcB6yFt/0I/PWoSjcbUMPQTzFIy8yxvdIoPTlj/P6+uNgweTvMFI4+UOuCI71IhB/liTHn1/2dXQM94SFd4VQeg+3Tc6gDxEqRSS6dLIq0uvR8//luIpoW38yh2ozwHmjMKTvHnbduGqHlES4qz9cU9iZkWoPzSp+qoxCOijHvwzL5vD0/k4hZ/iJyTzDHQLDra3Kaa8ykWdERCxjpMp1y9dVQ23lVxp+UUAt3RHOCU1/KuNM9Pr hxr@mk diff --git a/ansible-roles/ssh-host-sign/tasks/main.yml b/ansible-roles/ssh-host-sign/tasks/main.yml deleted file mode 100644 index c6a04585..00000000 --- a/ansible-roles/ssh-host-sign/tasks/main.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- name: Copy server key into VM temporarily - copy: - src: server_ca - dest: /tmp/server_ca - owner: root - group: root - mode: 0600 - -- name: Sign Keys - command: ssh-keygen -s /tmp/server_ca -I key_for_test1 -h -V +52w /etc/ssh/ssh_host_{{ item }}_key.pub - with_items: - - rsa - - ecdsa - - ed25519 - -- lineinfile: - path: /etc/ssh/sshd_config - regexp: "^HostKey /etc/ssh/ssh_host_{{ item }}_key" - line: "HostKey /etc/ssh/ssh_host_{{ item }}_key\nHostCertificate /etc/ssh/ssh_host_{{ item }}_key-cert.pub" - with_items: - - rsa - - ecdsa - - ed25519 - -- name: Ensure server key is gone - file: - path: /tmp/server_ca - state: absent - -- name: "Helper" - debug: - msg: "Please add the following to your known_hosts file: @cert-authority {{ lookup('file', 'server_ca.pub') }}" From 85bcd4218a773ad97eeb513f3a6283f9702eec86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:55:44 +0200 Subject: [PATCH 135/424] Remove unused `geerlingguy.nodejs` Ansible role --- ansible-roles/geerlingguy.nodejs/.gitignore | 2 - ansible-roles/geerlingguy.nodejs/.travis.yml | 41 ----------- ansible-roles/geerlingguy.nodejs/LICENSE | 20 ----- ansible-roles/geerlingguy.nodejs/README.md | 73 ------------------- .../geerlingguy.nodejs/defaults/main.yml | 26 ------- .../meta/.galaxy_install_info | 1 - .../geerlingguy.nodejs/meta/main.yml | 30 -------- .../geerlingguy.nodejs/tasks/main.yml | 41 ----------- .../geerlingguy.nodejs/tasks/setup-Debian.yml | 25 ------- .../geerlingguy.nodejs/tasks/setup-RedHat.yml | 37 ---------- .../geerlingguy.nodejs/templates/npm.sh.j2 | 3 - .../geerlingguy.nodejs/tests/README.md | 11 --- .../geerlingguy.nodejs/tests/test-latest.yml | 21 ------ .../geerlingguy.nodejs/tests/test.yml | 20 ----- 14 files changed, 351 deletions(-) delete mode 100644 ansible-roles/geerlingguy.nodejs/.gitignore delete mode 100644 ansible-roles/geerlingguy.nodejs/.travis.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/LICENSE delete mode 100644 ansible-roles/geerlingguy.nodejs/README.md delete mode 100644 ansible-roles/geerlingguy.nodejs/defaults/main.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info delete mode 100644 ansible-roles/geerlingguy.nodejs/meta/main.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/tasks/main.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2 delete mode 100644 ansible-roles/geerlingguy.nodejs/tests/README.md delete mode 100644 ansible-roles/geerlingguy.nodejs/tests/test-latest.yml delete mode 100644 ansible-roles/geerlingguy.nodejs/tests/test.yml diff --git a/ansible-roles/geerlingguy.nodejs/.gitignore b/ansible-roles/geerlingguy.nodejs/.gitignore deleted file mode 100644 index c9b2377e..00000000 --- a/ansible-roles/geerlingguy.nodejs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.retry -tests/test.sh diff --git a/ansible-roles/geerlingguy.nodejs/.travis.yml b/ansible-roles/geerlingguy.nodejs/.travis.yml deleted file mode 100644 index 08618968..00000000 --- a/ansible-roles/geerlingguy.nodejs/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -services: docker - -env: - # Defaults. - - distro: centos7 - - distro: centos6 - - distro: ubuntu1804 - - distro: ubuntu1604 - - distro: debian9 - - distro: debian8 - - # Latest release. - - distro: centos7 - playbook: test-latest.yml - - distro: ubuntu1604 - playbook: test-latest.yml - -script: - # Configure test script so we can run extra tests after playbook is run. - - export container_id=$(date +%s) - - export cleanup=false - - # Download test shim. - - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/ - - chmod +x ${PWD}/tests/test.sh - - # Run tests. - - ${PWD}/tests/test.sh - - # Ensure Node.js is installed. - - 'docker exec --tty ${container_id} env TERM=xterm which node' - - 'docker exec --tty ${container_id} env TERM=xterm node -v' - - # Ensure npm packages are installed globally. - - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"' - - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"' - - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 yo"' - -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/ansible-roles/geerlingguy.nodejs/LICENSE b/ansible-roles/geerlingguy.nodejs/LICENSE deleted file mode 100644 index 4275cf3c..00000000 --- a/ansible-roles/geerlingguy.nodejs/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2017 Jeff Geerling - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/ansible-roles/geerlingguy.nodejs/README.md b/ansible-roles/geerlingguy.nodejs/README.md deleted file mode 100644 index fa703d9e..00000000 --- a/ansible-roles/geerlingguy.nodejs/README.md +++ /dev/null @@ -1,73 +0,0 @@ -# Ansible Role: Node.js - -[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nodejs.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nodejs) - -Installs Node.js on RHEL/CentOS or Debian/Ubuntu. - -## Requirements - -None. - -## Role Variables - -Available variables are listed below, along with default values (see `defaults/main.yml`): - - nodejs_version: "6.x" - -The Node.js version to install. "6.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS. - - nodejs_install_npm_user: "{{ ansible_ssh_user }}" - -The user for whom the npm packages will be installed can be set here, this defaults to `ansible_user`. - - npm_config_prefix: "/usr/local/lib/npm" - -The global installation directory. This should be writeable by the `nodejs_install_npm_user`. - - npm_config_unsafe_perm: "false" - -Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail. - - nodejs_npm_global_packages: [] - -A list of npm packages with a `name` and (optional) `version` to be installed globally. For example: - - nodejs_npm_global_packages: - # Install a specific version of a package. - - name: jslint - version: 0.9.3 - # Install the latest stable release of a package. - - name: node-sass - # This shorthand syntax also works (same as previous example). - - node-sass - - - nodejs_package_json_path: "" - -Set a path pointing to a particular `package.json` (e.g. `"/var/www/app/package.json"`). This will install all of the defined packages globally using Ansible's `npm` module. - -## Dependencies - -None. - -## Example Playbook - - - hosts: utility - vars_files: - - vars/main.yml - roles: - - geerlingguy.nodejs - -*Inside `vars/main.yml`*: - - nodejs_npm_global_packages: - - name: jslint - - name: node-sass - -## License - -MIT / BSD - -## Author Information - -This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/). diff --git a/ansible-roles/geerlingguy.nodejs/defaults/main.yml b/ansible-roles/geerlingguy.nodejs/defaults/main.yml deleted file mode 100644 index 47327488..00000000 --- a/ansible-roles/geerlingguy.nodejs/defaults/main.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x", "9.x"). -# Version numbers from Nodesource: https://github.com/nodesource/distributions -nodejs_version: "6.x" - -# The user for whom the npm packages will be installed. -# nodejs_install_npm_user: username - -# The directory for global installations. -npm_config_prefix: "/usr/local/lib/npm" - -# Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail. -npm_config_unsafe_perm: "false" - -# Define a list of global packages to be installed with NPM. -nodejs_npm_global_packages: [] -# # Install a specific version of a package. -# - name: jslint -# version: 0.9.3 -# # Install the latest stable release of a package. -# - name: node-sass -# # This shorthand syntax also works (same as previous example). -# - node-sass - -# The path of a package.json file used to install packages globally. -nodejs_package_json_path: "" diff --git a/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info b/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info deleted file mode 100644 index 7a45294d..00000000 --- a/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info +++ /dev/null @@ -1 +0,0 @@ -{install_date: 'Wed Oct 17 07:54:14 2018', version: 4.2.2} diff --git a/ansible-roles/geerlingguy.nodejs/meta/main.yml b/ansible-roles/geerlingguy.nodejs/meta/main.yml deleted file mode 100644 index b567a2f6..00000000 --- a/ansible-roles/geerlingguy.nodejs/meta/main.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -dependencies: [] - -galaxy_info: - author: geerlingguy - description: Node.js installation for Linux - company: "Midwestern Mac, LLC" - license: "license (BSD, MIT)" - min_ansible_version: 2.4 - platforms: - - name: EL - versions: - - 6 - - 7 - - name: Debian - versions: - - all - - name: Ubuntu - versions: - - trusty - - xenial - - bionic - galaxy_tags: - - development - - web - - javascript - - js - - node - - npm - - nodejs diff --git a/ansible-roles/geerlingguy.nodejs/tasks/main.yml b/ansible-roles/geerlingguy.nodejs/tasks/main.yml deleted file mode 100644 index 6b125c14..00000000 --- a/ansible-roles/geerlingguy.nodejs/tasks/main.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- import_tasks: setup-RedHat.yml - when: ansible_os_family == 'RedHat' - -- import_tasks: setup-Debian.yml - when: ansible_os_family == 'Debian' - -- name: Define nodejs_install_npm_user - set_fact: - nodejs_install_npm_user: "{{ ansible_user | default(lookup('env', 'USER')) }}" - when: nodejs_install_npm_user is not defined - -- name: Create npm global directory - file: - path: "{{ npm_config_prefix }}" - owner: "{{ nodejs_install_npm_user }}" - group: "{{ nodejs_install_npm_user }}" - state: directory - -- name: Add npm_config_prefix bin directory to global $PATH. - template: - src: npm.sh.j2 - dest: /etc/profile.d/npm.sh - mode: 0644 - -- name: Ensure npm global packages are installed. - npm: - name: "{{ item.name | default(item) }}" - version: "{{ item.version | default('latest') }}" - global: yes - state: latest - environment: - NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}" - NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules" - NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}" - with_items: "{{ nodejs_npm_global_packages }}" - -- name: Install packages defined in a given package.json. - npm: - path: "{{ nodejs_package_json_path }}" - when: nodejs_package_json_path is defined and nodejs_package_json_path diff --git a/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml deleted file mode 100644 index c939617e..00000000 --- a/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- name: Ensure apt-transport-https is installed. - apt: name=apt-transport-https state=present - -- name: Add Nodesource apt key. - apt_key: - url: https://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0x1655A0AB68576280 - id: "68576280" - state: present - -- name: Add NodeSource repositories for Node.js. - apt_repository: - repo: "{{ item }}" - state: present - with_items: - - "deb https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main" - - "deb-src https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main" - register: node_repo - -- name: Update apt cache if repo was added. - apt: update_cache=yes - when: node_repo.changed - -- name: Ensure Node.js and npm are installed. - apt: "name=nodejs={{ nodejs_version|regex_replace('x', '') }}* state=present" diff --git a/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml deleted file mode 100644 index f2b9ee77..00000000 --- a/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: Set up the Nodesource RPM directory for Node.js > 0.10. - set_fact: - nodejs_rhel_rpm_dir: "pub_{{ nodejs_version }}" - when: nodejs_version != '0.10' - -- name: Set up the Nodesource RPM variable for Node.js == 0.10. - set_fact: - nodejs_rhel_rpm_dir: "pub" - when: nodejs_version == '0.10' - -- name: Import Nodesource RPM key (CentOS < 7). - rpm_key: - key: http://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL - state: present - when: ansible_distribution_major_version|int < 7 - -- name: Import Nodesource RPM key (CentOS 7+).. - rpm_key: - key: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL - state: present - when: ansible_distribution_major_version|int >= 7 - -- name: Add Nodesource repositories for Node.js (CentOS < 7). - yum: - name: "http://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm" - state: present - when: ansible_distribution_major_version|int < 7 - -- name: Add Nodesource repositories for Node.js (CentOS 7+). - yum: - name: "https://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm" - state: present - when: ansible_distribution_major_version|int >= 7 - -- name: Ensure Node.js and npm are installed. - yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='nodesource'" diff --git a/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2 b/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2 deleted file mode 100644 index 67caa789..00000000 --- a/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2 +++ /dev/null @@ -1,3 +0,0 @@ -export PATH={{ npm_config_prefix }}/bin:$PATH -export NPM_CONFIG_PREFIX={{ npm_config_prefix }} -export NODE_PATH=$NODE_PATH:{{ npm_config_prefix }}/lib/node_modules diff --git a/ansible-roles/geerlingguy.nodejs/tests/README.md b/ansible-roles/geerlingguy.nodejs/tests/README.md deleted file mode 100644 index 6fb21172..00000000 --- a/ansible-roles/geerlingguy.nodejs/tests/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Ansible Role tests - -To run the test playbook(s) in this directory: - - 1. Install and start Docker. - 1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`: - - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/` - 1. Make the test shim executable: `chmod +x tests/test.sh`. - 1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh` - -If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)` diff --git a/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml b/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml deleted file mode 100644 index 8aee4138..00000000 --- a/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- hosts: all - - vars: - nodejs_version: "9.x" - nodejs_install_npm_user: root - npm_config_prefix: /root/.npm-global - npm_config_unsafe_perm: "true" - nodejs_npm_global_packages: - - node-sass - - name: jslint - version: 0.12.0 - - name: yo - - pre_tasks: - - name: Update apt cache. - apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' - - roles: - - role_under_test diff --git a/ansible-roles/geerlingguy.nodejs/tests/test.yml b/ansible-roles/geerlingguy.nodejs/tests/test.yml deleted file mode 100644 index 72832e0d..00000000 --- a/ansible-roles/geerlingguy.nodejs/tests/test.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- hosts: all - - vars: - nodejs_install_npm_user: root - npm_config_prefix: /root/.npm-global - npm_config_unsafe_perm: "true" - nodejs_npm_global_packages: - - node-sass - - name: jslint - version: 0.9.6 - - name: yo - - pre_tasks: - - name: Update apt cache. - apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' - - roles: - - role_under_test From 487c259c7b33fb1f7b66a89072d6dc56b2920f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:56:08 +0200 Subject: [PATCH 136/424] Remove unused `dynmotd` Ansible role --- ansible-roles/dynmotd/files/identicon.py | 43 ------------------- ansible-roles/dynmotd/tasks/main.yml | 29 ------------- ansible-roles/dynmotd/templates/dynmotd.sh.j2 | 32 -------------- .../dynmotd/templates/vgcn-release.j2 | 1 - 4 files changed, 105 deletions(-) delete mode 100644 ansible-roles/dynmotd/files/identicon.py delete mode 100644 ansible-roles/dynmotd/tasks/main.yml delete mode 100644 ansible-roles/dynmotd/templates/dynmotd.sh.j2 delete mode 100644 ansible-roles/dynmotd/templates/vgcn-release.j2 diff --git a/ansible-roles/dynmotd/files/identicon.py b/ansible-roles/dynmotd/files/identicon.py deleted file mode 100644 index 13d37bf1..00000000 --- a/ansible-roles/dynmotd/files/identicon.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 -# Based off of https://github.com/fdcore/python-iden-svg (MIT license) -import sys -import hashlib - - -def colored(num, value, bg=False): - x = 48 if bg else 38 - return '\x1b[{0};5;{1}m{2}\x1b[0m'.format(x, num, value) - - -class Iden: - def build(self, h): - pixels = [[0 for _ in range(5)] for _ in range(5)] - for i in range(0, 5): - for x in range(0, 5): - pixels[x][i] = self.showPixel(i, x, h) - return pixels - - def showPixel(self, x, y, h): - m = 6 + abs(2-x) * 5 + y - return int(h[m:m+1], 16) % 2 == 0 - - def getIcon(self, num, hash_string): - for x in self.build(hash_string): - yield ''.join([ - colored(num, '██') if q else - colored((num + 15) % 255, ' ', bg=True) - for q in x - ]) - - -if __name__ == '__main__': - data = sys.stdin.read().strip() - - m = hashlib.sha256() - m.update(data.encode('UTF-8')) - hash_string = m.hexdigest() - num = int(hash_string[0:2], 16) - - for line in Iden().getIcon(num, hash_string): - print(line) diff --git a/ansible-roles/dynmotd/tasks/main.yml b/ansible-roles/dynmotd/tasks/main.yml deleted file mode 100644 index 224caa2e..00000000 --- a/ansible-roles/dynmotd/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: dynmotd file - template: - src: dynmotd.sh.j2 - dest: /usr/bin/dynmotd - owner: root - group: root - mode: 0755 - -- name: identicon script - copy: - src: identicon.py - dest: /usr/bin/identicon - owner: root - group: root - mode: 0755 - -- name: add to profile - lineinfile: - path: /etc/profile - line: "/usr/bin/dynmotd" - -- name: Add tag file - template: - src: vgcn-release.j2 - dest: /etc/vgcn-release - owner: root - group: root - mode: 0444 diff --git a/ansible-roles/dynmotd/templates/dynmotd.sh.j2 b/ansible-roles/dynmotd/templates/dynmotd.sh.j2 deleted file mode 100644 index a93330fc..00000000 --- a/ansible-roles/dynmotd/templates/dynmotd.sh.j2 +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -data=$(hostname -f) -icon="$(echo "$data" | /usr/bin/identicon)" -color_fg=$((16#$(echo "$data" | tr -d '\n' | sha256sum | cut -c1-2))) -color_bg=$(( color_fg + 15 )) -bg="\033[48;5;${color_bg}m" -fg="\033[38;5;${color_fg}m" -clear="\033[0m" - -line() { - head -n $1 | tail -n 1 -} - -echo -e "${fg}${bg} ██╗ ██╗ ██████╗ ██████╗ ██████╗ ${clear} $(line 1 <<< "$icon")" -echo -e "${fg}${bg} ██║ ██║██╔════╝ ██╔════╝ ██╔══██╗${clear} $(line 2 <<< "$icon")" -echo -e "${fg}${bg} ╚██╗ ██╔╝██║ ███╗ ██║ ███╗██████╔╝${clear} $(line 3 <<< "$icon")" -echo -e "${fg}${bg} ╚████╔╝ ╚██████╔╝ ╚██████╔╝██╔═══╝ ${clear} $(line 4 <<< "$icon")" -echo -e "${fg}${bg} ╚═══╝ ╚═════╝ ╚═════╝ ╚═╝ ${clear} $(line 5 <<< "$icon")" -echo "==================================================== -Hostname..........: `hostname -f` -Release...........: `cat /etc/redhat-release` -Build.............: VGGP build {{ cloud }} {{ build_tag }} -Build Date........: {{ ansible_date_time.iso8601 }} -==================================================== -Current user......: `whoami` -Load..............: `cat /proc/loadavg` -Uptime............: `uptime -p` -{% for custom_command in dynmotd_custom %} -{%set periods = custom_command.name | length%} -{{ custom_command.name }}{%for i in range(18 - periods)%}.{% endfor %}: `{{ custom_command.command }}` -{% endfor %} -====================================================" diff --git a/ansible-roles/dynmotd/templates/vgcn-release.j2 b/ansible-roles/dynmotd/templates/vgcn-release.j2 deleted file mode 100644 index 3d0681b0..00000000 --- a/ansible-roles/dynmotd/templates/vgcn-release.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ ansible_distribution }} {{ ansible_distribution_version }} VGGP {{ build_tag }} From d83cd05eebea4962ddd4fc5fb84180bb6f15b168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:56:53 +0200 Subject: [PATCH 137/424] Remove unused `galaxy` Ansible role --- ansible-roles/galaxy/tasks/main.yml | 39 ----------------------------- 1 file changed, 39 deletions(-) delete mode 100644 ansible-roles/galaxy/tasks/main.yml diff --git a/ansible-roles/galaxy/tasks/main.yml b/ansible-roles/galaxy/tasks/main.yml deleted file mode 100644 index 11995c69..00000000 --- a/ansible-roles/galaxy/tasks/main.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- lineinfile: - path: /etc/group - regexp: 'input:x:999:' - line: 'input:x:500:' - when: replace_non_galaxy_999 is defined - -- command: "find / -gid 999 -exec chgrp 500 '{}' +" - ignore_errors: yes - when: replace_non_galaxy_999 is defined - -- lineinfile: - path: /etc/passwd - regexp: 'polkitd:x:999:998:User for polkitd:/:/sbin/nologin' - line: 'polkitd:x:500:998:User for polkitd:/:/sbin/nologin' - when: replace_non_galaxy_999 is defined - -- command: "find / -uid 999 -exec chown 500 '{}' +" - ignore_errors: yes - when: replace_non_galaxy_999 is defined - -- name: galaxy account group - group: - gid: "{{ galaxy_gid }}" - name: galaxy - state: present - -- name: galaxy account user - user: - uid: "{{ galaxy_uid }}" - name: galaxy - group: galaxy - home: /opt/galaxy - state: present - comment: Galaxy Service-Acct - createhome: no - -- name: 'disable selinux' - command: setenforce Permissive From b2ef55cb590d8a0f9583e304024eb0681bdee294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:57:17 +0200 Subject: [PATCH 138/424] Remove unused `dj-wasabi.telegraf` Ansible role --- .../.github/ISSUE_TEMPLATE/bug_report.md | 35 ---- .../.github/ISSUE_TEMPLATE/feature_request.md | 14 -- ansible-roles/dj-wasabi.telegraf/.gitignore | 7 - ansible-roles/dj-wasabi.telegraf/.travis.yml | 15 -- ansible-roles/dj-wasabi.telegraf/CHANGELOG.md | 108 ----------- .../dj-wasabi.telegraf/CODE_OF_CONDUCT.md | 3 - .../dj-wasabi.telegraf/CONTRIBUTING.md | 88 --------- ansible-roles/dj-wasabi.telegraf/LICENSE | 21 --- .../PULL_REQUEST_TEMPLATE.md | 12 -- ansible-roles/dj-wasabi.telegraf/README.md | 169 ------------------ .../dj-wasabi.telegraf/defaults/main.yml | 52 ------ .../dj-wasabi.telegraf/handlers/main.yml | 9 - .../meta/.galaxy_install_info | 1 - .../dj-wasabi.telegraf/meta/main.yml | 20 --- .../molecule/default/Dockerfile.j2 | 7 - .../molecule/default/INSTALL.rst | 46 ----- .../molecule/default/create.yml | 47 ----- .../molecule/default/destroy.yml | 16 -- .../molecule/default/molecule.yml | 33 ---- .../molecule/default/playbook.yml | 22 --- .../molecule/default/tests/test_default.py | 26 --- .../molecule/default/yaml-lint.yml | 9 - .../dj-wasabi.telegraf/requirements.txt | 4 - .../dj-wasabi.telegraf/tasks/Debian.yml | 42 ----- .../dj-wasabi.telegraf/tasks/RedHat.yml | 16 -- .../dj-wasabi.telegraf/tasks/configure.yml | 60 ------- .../dj-wasabi.telegraf/tasks/main.yml | 16 -- .../etc-opt-telegraf-telegraf.conf.j2 | 78 -------- .../templates/telegraf-extra-plugin.conf.j2 | 47 ----- .../templates/telegraf.conf.j2 | 100 ----------- 30 files changed, 1123 deletions(-) delete mode 100644 ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/.gitignore delete mode 100644 ansible-roles/dj-wasabi.telegraf/.travis.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/CHANGELOG.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/LICENSE delete mode 100644 ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/README.md delete mode 100644 ansible-roles/dj-wasabi.telegraf/defaults/main.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/handlers/main.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info delete mode 100644 ansible-roles/dj-wasabi.telegraf/meta/main.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2 delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py delete mode 100644 ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/requirements.txt delete mode 100644 ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/tasks/configure.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/tasks/main.yml delete mode 100644 ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2 delete mode 100644 ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2 delete mode 100644 ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2 diff --git a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md b/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 03201270..00000000 --- a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: Bug report -about: Help to improve this Ansible role. - ---- - -**Describe the bug** - - -**Installation method/version** - - -* Github / latest -* Ansible Galaxy / 1.1.0 - -**Ansible Version** - -``` - -``` - -**Targetted hosts** -Concerns the following OS(es): - - -* Ubuntu -* Debian -* CentOS -* Mint - -**Expected behavior** - - -**Additional context** - diff --git a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md b/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 08c83431..00000000 --- a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this Ansible role - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/ansible-roles/dj-wasabi.telegraf/.gitignore b/ansible-roles/dj-wasabi.telegraf/.gitignore deleted file mode 100644 index d52963b9..00000000 --- a/ansible-roles/dj-wasabi.telegraf/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.idea -.molecule -tests/.cache -.cache -__pycache__ -*.retry -pmip diff --git a/ansible-roles/dj-wasabi.telegraf/.travis.yml b/ansible-roles/dj-wasabi.telegraf/.travis.yml deleted file mode 100644 index 86a0c657..00000000 --- a/ansible-roles/dj-wasabi.telegraf/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -sudo: required -language: python -services: - - docker - -install: - - pip install -r requirements.txt - -script: - - molecule --version - - ansible --version - - molecule test -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md b/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md deleted file mode 100644 index d9d022c8..00000000 --- a/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md +++ /dev/null @@ -1,108 +0,0 @@ -dj-wasabi.telegraf ------------------- - -Below an overview of all changes in the releases. - -Version (Release date) - -0.10.0 (2018-08-12) - - * Updating to telegraf 1.7.3 - * Fix Deprecation warnings #54 - * Changed 'include' to 'include_tasks' to remove deprecation warning #53 (By pull request: tjend (Thanks!)) - * Add option to remove extra plugin config files #52 (By pull request: tjend (Thanks!)) - * Plugins extra hash allow multiple inputs same type #50 (By pull request: tjend (Thanks!)) - * Using specific version for tests - * Update minimum Ansible version to 2.4 - -0.9.0 (2018-05-06) - - * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!)) - * Fix markdown #41 (By pull request: Angristan (Thanks!)) - * Allow to override RedHat release version #43 (By pull request: tszym (Thanks!)) - * Improved comments, split up role, moved tags and added defaults #45 (By pull request: boxrick (Thanks!)) - * Fix Travis Tests #42 - * Convert the telegraf_plugins_extra varaible to a hash so that we can … #46 (By pull request: tjend (Thanks!)) - -0.8.0 (2017-10-30) - - * Updating to Molecule V2 - * Test if LSB codename exists before using it #35 (By pull request: tszym (Thanks!)) - * Remove useless packages on RedHat. fix #28 #36 (By pull request: tszym (Thanks!)) - * Fix extra plugins by file / Change apt source filename / Change tags by global_tags #37 (By pull request: aarnaud (Thanks!)) - * Use telegra_global_tags for oldest telegraf versions #38 (By pull request: tszym (Thanks!)) - -0.7.0 (2017-02-23) - - * Replace action by modules #26 (By pull request: tszym (Thanks!)) - * Use yum repository to install telegraf on RedHat #25 (By pull request: tszym (Thanks!)) - * Remove for-loop in extra-plugin template #24 (By pull request: emersondispatch (Thanks!)) - * Update Debian.yml #23 (By pull request: zend0 (Thanks!)) - * extra plugins tags #21 (By pull request: oboukili (Thanks!)) - * Input tags support #20 (By pull request: szibis (Thanks!)) - * Fix telegraf confguration permissions #19 (By pull request: szibis (Thanks!)) - -0.6.0 (2017-01-02) - - * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!)) - * Do "become" for the steps that require root access on Debian #10 (By pull request: Ismael (Thanks!)) - * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #11 (By pull request: Ismael (Thanks!)) - * Removed imports #12 - * Fixing molecule #15 - * set telegraf hostname in defaults. #13 (By pull request: romainbureau (Thanks!)) - * use version_compare filter … #14 (By pull request: lhoss (Thanks!)) - * support missing agent settings upto telegraf v1.1 #16 (By pull request: lhoss (Thanks!)) - * update the README with the latest v0.13 - v1.1 agent settings #17 (By pull request: lhoss (Thanks!)) - -0.5.1 (2016-08-24) - - * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!)) - -0.5.0 (2016-07-17) - - * Removed Test Kitchen tests - * Added Molecule tests and travis make use of them - * Updated default version to 1.0.0 beta2 - * Feature/add extra plugins to telegrafd folder #5 (By pull request: stvnwrgs (Thanks!)) - -0.4.0 (2016-02-05) - - * Fixed test for test-kitchen - * Added travis-ci test for testing default installation when PR is made - * Fixed Download url for Debian - * Removed default entry for telegraf_plugins_extra - -0.3.0 (2016-01-13) - - * Made it work with telegraf 0.10.0 - * Default installation: 0.10.0 - -0.2.0 (2015-11-14) - - * Fixed kitchen test setup - * Adding "net" to the telegraf_plugins_default property - * Update etc-opt-telegraf-telegraf.conf.j2 #2 (By pull request: aferrari-technisys (Thanks!)) - * Improvement and upgrade for v0.2.0 of telegraf #1 (By pull request: aferrari-technisys (Thanks!)) - -0.1.0 (2015-09-23) - - * Updated `telegraf_agent_version` to 0.1.9 - * Added restart when package is changed (When updated for example) - * Added several plugin options: - * pass - * drop - * tagpass - * tagdrop - * interval - * Updated documentation - - -0.0.2 (2015-09-20) - - * Updated README dus to missing colon - * Forgot to update the meta file - * Added Changelog file - -0.0.1 (2015-09-20) - - * Initial release diff --git a/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md b/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md deleted file mode 100644 index e28ac17f..00000000 --- a/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,3 +0,0 @@ -# Code of Conduct - -The Code of Conduct from Ansible found [here](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html) applies to this Ansible role as well. diff --git a/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md b/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md deleted file mode 100644 index 4b8af376..00000000 --- a/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md +++ /dev/null @@ -1,88 +0,0 @@ -# Contributing to this role - -**Table of content** - -- [Contributing to this role](#contributing-to-this-role) - * [Contributing](#contributing) - * [(local) Development](#-local--development) - + [Requirements](#requirements) - + [Execution](#execution) -- [Other](#other) - * [Virtualenv](#virtualenv) - * [Links](#links) - -Thank you very much for making time to improve this Ansible role. - -## Contributing - -Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html). - -1. Fork the repo - -2. Create a branch and apply your changes to this branch. - - a. Make sure you have updated the documentation when adding new variables; - - b. Don't forget to add/update tests so we can test the functionality during each Pull Request; - - c. Make sure the tests will succeed. - -3. Push the branch to your fork and submit a pull request. - -**Note** - -Pull Requests that fails during the tests will not be merged. - -## Coding Guidelines - -Style guides are important because they ensure consistency in the content, look, and feel of a book or a website. - -* [Ansible Style Guide](http://docs.ansible.com/ansible/latest/dev_guide/style_guide/) -* It's "Ansible" when referring to the product and ``ansible`` when referring to the command line tool, package, etc -* Playbooks should be written in multi-line YAML with ``key: value``. The form ``key=value`` is only for ``ansible`` ad-hoc, not for ``ansible-playbook``. -* Tasks should always have a ``name:`` - -## (local) Development - -This role make use of Molecule to test the execution of the role and verificate it. In the root of the repository, a file named `requirements.txt` exists and contains the versions used by the tests. - -### Requirements - -You can install them with the following command: - -``` -pip install -r requirements.txt -``` - -Once the dependencies are installed, please install Docker as Molecule is configured in this repository to create Docker containers. See [this](https://docs.docker.com/install/) link to install Docker on your system. - -### Execution - -Once everything is installed, you can validate your changes by executing: -``` -molecule test -``` - -It should run without any issues. - -# Other - -## Virtualenv - -Suggestion is to create a virtualenv so you won't have issues with other projects. - -Some web pages describing for virtual env: - -* http://thepythonguru.com/python-virtualenv-guide/ -* https://realpython.com/python-virtual-environments-a-primer/ -* https://www.dabapps.com/blog/introduction-to-pip-and-virtualenv-python/ - -## Links - -[Molecule](https://molecule.readthedocs.io/) - -[Ansible](https://www.ansible.com/) - -[Molecule V2 with your own role](https://werner-dijkerman.nl/2017/09/05/using-molecule-v2-to-test-ansible-roles/) - -**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged. diff --git a/ansible-roles/dj-wasabi.telegraf/LICENSE b/ansible-roles/dj-wasabi.telegraf/LICENSE deleted file mode 100644 index 6922fb32..00000000 --- a/ansible-roles/dj-wasabi.telegraf/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Werner Dijkerman - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md b/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 70c5edef..00000000 --- a/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,12 +0,0 @@ -**Description of PR** - - -**Type of change** - - -Feature Pull Request -Bugfix Pull Request -Docs Pull Request - -**Fixes an issue** - diff --git a/ansible-roles/dj-wasabi.telegraf/README.md b/ansible-roles/dj-wasabi.telegraf/README.md deleted file mode 100644 index 5b65c891..00000000 --- a/ansible-roles/dj-wasabi.telegraf/README.md +++ /dev/null @@ -1,169 +0,0 @@ -# dj-wasabi.telegraf - -## Build status: - -[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf) - -This role will install and configure telegraf. - -Telegraf is an agent written in Go for collecting metrics from the system it's running on, or from other services, and writing them into InfluxDB. - -Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics from well known services (like Hadoop, Postgres, or Redis) and third party APIs (like Mailchimp, AWS CloudWatch, or Google Analytics). - -(https://github.com/influxdb/telegraf) - -## Requirements - - -No requirements. (Yes, an Influxdb server somewhere on the network will help though ;-) ) - -## Upgrade -### 0.7.0 - -There was an issue: - - If I configure a telegraf_plugins_extra, run ansible, delete the plugin and run ansible again, the plugin stays on the machine. - - - -## Role Variables - -The following parameters can be set for the Telegraf agent: - -* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.0.0` -* `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10` -* `telegraf_agent_debug`: Run Telegraf in debug mode. Default: `False` -* `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True -* `telegraf_agent_flush_interval`: Default data flushing interval for all outputs. Default: 10 -* `telegraf_agent_flush_jitter`: Jitter the flush interval by a random amount. Default: 0 -* `telegraf_agent_aws_tags`: Configure AWS ec2 tags into Telegraf tags section Default: `False` -* `telegraf_agent_aws_tags_prefix`: Define a prefix for AWS ec2 tags. Default: `""` -* `telegraf_agent_collection_jitter`: Jitter the collection by a random amount. Default: 0 (since v0.13) -* `telegraf_agent_metric_batch_size`: The agent metric batch size. Default: 1000 (since v0.13) -* `telegraf_agent_metric_buffer_limit`: The agent metric buffer limit. Default: 10000 (since v0.13) -* `telegraf_agent_quiet`: Run Telegraf in quiet mode (error messages only). Default: `False` (since v0.13) -* `telegraf_agent_logfile`: The agent logfile name. Default: '' (means to log to stdout) (since v1.1) -* `telegraf_agent_omit_hostname`: Do no set the "host" tag in the agent. Default: `False` (since v1.1) - -Full agent settings reference: https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration - -You can set tags for the host running telegraf: - - telegraf_global_tags: - - tag_name: some_name - tag_value: some_value - -Specifying an output. The default is set to localhost, you'll have to specify the correct influxdb server: - - telegraf_agent_output: - - type: influxdb - config: - - urls = ["http://localhost:8086"] - - database = "telegraf" - tagpass: - - diskmetrics = ["true"] - -The config will be printed line by line into the configuration, so you could also use: - - config: - - # Print an documentation line - -and it will be printed in the configuration file. - -There are two properties which are similar, but are used differently. Those are: - -* `telegraf_plugins_default` -* `telegraf_plugins_extra` - -With the property `telegraf_plugins_default` it is set to use the default set of Telegraf plugins. You could override it with more plugins, which should be enabled at default. - - telegraf_plugins_default: - - plugin: cpu - config: - - percpu = true - - plugin: disk - - plugin: io - - plugin: mem - - plugin: system - - plugin: swap - - plugin: netstat - -Every telegraf agent has these as a default configuration. - -The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. It is a hash instead of a list, so that you can merge values from multiple var files together. Following is an example for using this parameter for MySQL database servers: - - cat group_vars/mysql_database - telegraf_plugins_extra: - mysql: - config: - - servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"] - - -Telegraf plugin options: - -* `tags` An k/v tags to apply to a specific input's measurements. Can be used on any stage for better filtering for example in outputs. -* `pass`: An array of strings that is used to filter metrics generated by the current plugin. Each string in the array is tested as a prefix against metric names and if it matches, the metric is emitted. -* `drop`: The inverse of pass, if a metric name matches, it is not emitted. -* `tagpass`: (added in Telegraf 0.1.5) tag names and arrays of strings that are used to filter metrics by the current plugin. Each string in the array is tested as an exact match against the tag name, and if it matches the metric is emitted. -* `tagdrop`: (added in Telegraf 0.1.5) The inverse of tagpass. If a tag matches, the metric is not emitted. This is tested on metrics that have passed the tagpass test. -* `interval`: How often to gather this metric. Normal plugins use a single global interval, but if one particular plugin should be run less or more often, you can configure that here. - -An example might look like this: - - telegraf_plugins_default: - - plugin: disk - interval: 12 - tags: - - diskmetrics = "true" - tagpass: - - fstype = [ "ext4", "xfs" ] - - path = [ "/opt", "/home" ] - - - -## Dependencies - -No dependencies - -## Example Playbook - - - hosts: servers - roles: - - { role: dj-wasabi.telegraf } - -## Contributors - -The following have contributed to this Ansible role: - - * Thomas Szymanski - * Alejandro - * Slawomir Skowron - * Ismael - * Laurent Hoss - * Anthony ARNAUD - * Rick Box - * Emerson Knapp - * gaelL - * Steven Wirges - * zend0 - * Angristan - * Olivier Boukili - * Romain BUREAU - * TheCodeAssassin - * tjend - -Thank you all! - -## Molecule - -This roles is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: https://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/ - -## License - -BSD - -## Author Information - -Please let me know if you have issues. Pull requests are also accepted! :-) - -mail: ikben [ at ] werner-dijkerman . nl diff --git a/ansible-roles/dj-wasabi.telegraf/defaults/main.yml b/ansible-roles/dj-wasabi.telegraf/defaults/main.yml deleted file mode 100644 index bd799c9c..00000000 --- a/ansible-roles/dj-wasabi.telegraf/defaults/main.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# defaults file for ansible-telegraf - -telegraf_agent_version: 1.7.3 -telegraf_agent_hostname: "{{ ansible_fqdn }}" -telegraf_agent_interval: 10 -telegraf_agent_debug: False -telegraf_agent_round_interval: True -telegraf_agent_flush_interval: 10 -telegraf_agent_flush_jitter: 0 -telegraf_agent_aws_tags: False -telegraf_agent_aws_tags_prefix: "" - -# v0.13 settings (not sure if supported in older version): -telegraf_agent_collection_jitter: 0 -telegraf_agent_metric_batch_size: 1000 -telegraf_agent_metric_buffer_limit: 10000 -telegraf_agent_quiet: False - -# v1.1 settings: -telegraf_agent_logfile: "" -telegraf_agent_omit_hostname: False - -telegraf_global_tags: [] - -telegraf_agent_output: - - type: influxdb - config: - - urls = ["http://localhost:8086"] - - database = "telegraf" - - precision = "s" - -# defaults - /etc/telegraf/telegraf.conf -telegraf_plugins_default: - - plugin: cpu - config: - - percpu = true - - plugin: disk - - plugin: io - - plugin: mem - - plugin: net - - plugin: system - - plugin: swap - - plugin: netstat - - plugin: processes - - plugin: kernel - -# extra configuration - /etc/telegraf/telegraf.d/* -telegraf_plugins_extra: {} - -# RedHat specific settings for convenience -telegraf_redhat_releasever: "$releasever" diff --git a/ansible-roles/dj-wasabi.telegraf/handlers/main.yml b/ansible-roles/dj-wasabi.telegraf/handlers/main.yml deleted file mode 100644 index 78a82a72..00000000 --- a/ansible-roles/dj-wasabi.telegraf/handlers/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# handlers file for ansible-telegraf - -- name: "Restart Telegraf" - service: - name: telegraf - state: restarted - enabled: yes - become: yes diff --git a/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info b/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info deleted file mode 100644 index f229fa4f..00000000 --- a/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info +++ /dev/null @@ -1 +0,0 @@ -{install_date: 'Mon Sep 17 11:27:03 2018', version: 0.10.0} diff --git a/ansible-roles/dj-wasabi.telegraf/meta/main.yml b/ansible-roles/dj-wasabi.telegraf/meta/main.yml deleted file mode 100644 index 016e57c5..00000000 --- a/ansible-roles/dj-wasabi.telegraf/meta/main.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -galaxy_info: - author: Werner Dijkerman - description: Installing and configuring Telegraf - company: - license: license BSD - min_ansible_version: 2.4 - platforms: - - name: EL - versions: - - all - - name: Ubuntu - versions: - - all - - name: Debian - versions: - - all - categories: - - monitoring -dependencies: [] diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2 b/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2 deleted file mode 100644 index 7ba209c3..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,7 +0,0 @@ -FROM {{ item.image }} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst b/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst deleted file mode 100644 index 09e87359..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst +++ /dev/null @@ -1,46 +0,0 @@ -******* -Install -******* - -This set of playbooks have specific dependencies on Ansible due to the modules -being used. - -Requirements -============ - -* Ansible 2.2 -* Docker Engine -* docker-py - -Install OS dependencies on CentOS 7 - -.. code-block:: bash - - $ sudo yum install -y epel-release - $ sudo yum install -y gcc python-pip python-devel openssl-devel - # If installing Molecule from source. - $ sudo yum install libffi-devel git - -Install OS dependencies on Ubuntu 16.x - -.. code-block:: bash - - $ sudo apt-get update - $ sudo apt-get install -y python-pip libssl-dev docker-engine - # If installing Molecule from source. - $ sudo apt-get install -y libffi-dev git - -Install OS dependencies on Mac OS - -.. code-block:: bash - - $ brew install python - $ brew install git - -Install using pip: - -.. code-block:: bash - - $ sudo pip install ansible - $ sudo pip install docker-py - $ sudo pip install molecule --pre diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml deleted file mode 100644 index eca41c5a..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- name: Create - hosts: localhost - connection: local - gather_facts: False - no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}" - vars: - molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}" - molecule_ephemeral_directory: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}" - molecule_scenario_directory: "{{ lookup('env', 'MOLECULE_SCENARIO_DIRECTORY') }}" - molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}" - tasks: - - name: Create Dockerfiles from image names - template: - src: "{{ molecule_scenario_directory }}/Dockerfile.j2" - dest: "{{ molecule_ephemeral_directory }}/Dockerfile_{{ item.image | regex_replace('[^a-zA-Z0-9_]', '_') }}" - with_items: "{{ molecule_yml.platforms }}" - register: platforms - - - name: Discover local Docker images - docker_image_facts: - name: "molecule_local/{{ item.item.name }}" - with_items: "{{ platforms.results }}" - register: docker_images - - - name: Build an Ansible compatible image - docker_image: - path: "{{ molecule_ephemeral_directory }}" - name: "molecule_local/{{ item.item.image }}" - dockerfile: "{{ item.item.dockerfile | default(item.invocation.module_args.dest) }}" - force: "{{ item.item.force | default(True) }}" - with_items: "{{ platforms.results }}" - when: platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0 - - - name: Create molecule instance(s) - docker_container: - name: "{{ item.name }}" - hostname: "{{ item.name }}" - image: "molecule_local/{{ item.image }}" - state: started - recreate: False - log_driver: none - command: "{{ item.command | default('sleep infinity') }}" - privileged: "{{ item.privileged | default(omit) }}" - volumes: "{{ item.volumes | default(omit) }}" - capabilities: "{{ item.capabilities | default(omit) }}" - with_items: "{{ molecule_yml.platforms }}" diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml deleted file mode 100644 index 63b5edf9..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Destroy - hosts: localhost - connection: local - gather_facts: False - no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}" - vars: - molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}" - molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}" - tasks: - - name: Destroy molecule instance(s) - docker_container: - name: "{{ item.name }}" - state: absent - force_kill: "{{ item.force_kill | default(True) }}" - with_items: "{{ molecule_yml.platforms }}" diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml deleted file mode 100644 index 1ae3e205..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: - name: yamllint - options: - config-file: molecule/default/yaml-lint.yml - -platforms: - - name: telegraf-centos - image: milcom/centos7-systemd - privileged: True - - name: telegraf-debian - image: minimum2scp/systemd-stretch - privileged: True - command: /sbin/init - - name: telegraf-ubuntu - image: solita/ubuntu-systemd:bionic - privileged: True - command: /sbin/init - -provisioner: - name: ansible - lint: - name: ansible-lint -scenario: - name: default -verifier: - name: testinfra - lint: - name: flake8 diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml deleted file mode 100644 index dd38a776..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- hosts: all - pre_tasks: - - name: "Installing which on CentOS" - yum: - name: which - state: present - when: - - ansible_os_family == 'RedHat' - - - name: "Installing wget on Debian" - apt: - name: "{{ item }}" - state: present - when: - - ansible_os_family == 'Debian' - with_items: - - wget - - gpg - - roles: - - role: ansible-telegraf diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py b/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py deleted file mode 100644 index fe5e7696..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py +++ /dev/null @@ -1,26 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') - - -def test_telegraf_running_and_enabled(Service, SystemInfo): - telegraf = Service("telegraf") - assert telegraf.is_enabled - if SystemInfo.distribution == 'centos': - assert telegraf.is_running - - -def test_telegraf_dot_conf(File): - telegraf = File("/etc/telegraf/telegraf.conf") - assert telegraf.user == "telegraf" - assert telegraf.group == "telegraf" - assert telegraf.mode == 0o640 - assert telegraf.contains('[[inputs.cpu]]') - - -def test_telegraf_package(Package, SystemInfo): - telegraf = Package('telegraf') - assert telegraf.is_installed diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml deleted file mode 100644 index cd377bf6..00000000 --- a/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -extends: default - -rules: - line-length: - max: 140 - level: warning - truthy: disable diff --git a/ansible-roles/dj-wasabi.telegraf/requirements.txt b/ansible-roles/dj-wasabi.telegraf/requirements.txt deleted file mode 100644 index 1b567a49..00000000 --- a/ansible-roles/dj-wasabi.telegraf/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -ansible==6.7.0 -docker==3.3.0 -molecule==2.13.1 -testinfra==1.12.0 diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml b/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml deleted file mode 100644 index d07077d4..00000000 --- a/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- - -- name: Ensure the system can use the HTTPS transport for APT. - stat: - path: /usr/lib/apt/methods/https - register: apt_https_transport - -- name: Install APT HTTPS transport. - apt: - name: "apt-transport-https" - state: present - when: not apt_https_transport.stat.exists - become: yes - -- name: Download Telegraf apt key. - apt_key: - url: "https://repos.influxdata.com/influxdb.key" - state: present - become: yes - -- name: Add Telegraf repository (using LSB). - apt_repository: - repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable" - filename: "telegraf" - state: present - become: yes - when: ansible_lsb is defined and ansible_lsb.codename is defined - -- name: Add Telegraf repository. - apt_repository: - repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable" - filename: "telegraf" - state: present - become: yes - when: ansible_lsb is not defined or ansible_lsb.codename is not defined - -- name: "Install telegraf package | Debian" - apt: - name: "telegraf" - state: present - notify: "Restart Telegraf" - become: yes diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml b/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml deleted file mode 100644 index f43df738..00000000 --- a/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# description: RedHat specific installation - -- name: "Add yum repository | RedHat" - yum_repository: - name: influxdb - description: InfluxDB Repository - RHEL $releasever - baseurl: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable" - gpgcheck: yes - gpgkey: https://repos.influxdata.com/influxdb.key - -- name: "Install telegraf package | RedHat" - yum: - name: "telegraf-{{ telegraf_agent_version }}" - state: installed - notify: "Restart Telegraf" diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml b/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml deleted file mode 100644 index 1fdb6f2b..00000000 --- a/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- -# description: Configure telegraf and get all relevent ec2 information - -- name: Retrieve ec2 facts - ec2_metadata_facts: - when: telegraf_agent_aws_tags - -- name: Retrieve all ec2 tags on the instance - ec2_tag: - region: '{{ ansible_ec2_placement_region }}' - resource: '{{ ansible_ec2_instance_id }}' - state: list - when: telegraf_agent_aws_tags - register: ec2_tags - -- name: "Copy the template for versions < 0.10.0" - template: - src: etc-opt-telegraf-telegraf.conf.j2 - dest: /etc/opt/telegraf/telegraf.conf - owner: telegraf - group: telegraf - mode: 0640 - become: yes - when: telegraf_agent_version is version_compare('0.10.0', '<') - notify: "Restart Telegraf" - -- name: "Copy the template for versions >= 0.10.0" - template: - src: telegraf.conf.j2 - dest: /etc/telegraf/telegraf.conf - owner: telegraf - group: telegraf - mode: 0640 - become: yes - when: telegraf_agent_version is version_compare('0.10.0', '>=') - notify: "Restart Telegraf" - -- name: "Copy telegraf extra plugins" - template: - src: "telegraf-extra-plugin.conf.j2" - dest: "/etc/telegraf/telegraf.d/{{ item.key }}.conf" - owner: telegraf - group: telegraf - mode: 0640 - with_dict: "{{ telegraf_plugins_extra }}" - when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and item.value.state|default('present') != 'absent'" - become: yes - notify: "Restart Telegraf" - -- name: "Remove telegraf extra plugins" - file: - path: "/etc/telegraf/telegraf.d/{{ item.key }}.conf" - state: absent - with_dict: "{{ telegraf_plugins_extra }}" - when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and item.value.state|default('present') == 'absent'" - become: yes - notify: "Restart Telegraf" - -- name: "Force restart service after reread config" - meta: flush_handlers diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/main.yml b/ansible-roles/dj-wasabi.telegraf/tasks/main.yml deleted file mode 100644 index 0f850ef9..00000000 --- a/ansible-roles/dj-wasabi.telegraf/tasks/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# tasks file for ansible-telegraf - -- name: "Install the correct repository" - include_tasks: "RedHat.yml" - when: ansible_os_family == "RedHat" - -- name: "Install the correct repository" - include_tasks: "Debian.yml" - when: ansible_os_family == "Debian" - tags: - - telegraf - - packages - -- name: "Configure telegraf" - include_tasks: "configure.yml" diff --git a/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2 deleted file mode 100644 index b6774b47..00000000 --- a/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2 +++ /dev/null @@ -1,78 +0,0 @@ -### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ### - -[tags] -{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %} -{% for item in telegraf_global_tags %} - {{ item.tag_name }} = "{{ item.tag_value }}" -{% endfor %} -{% endif %} - -{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %} -{% for key, value in ec2_tags.tags.items()%} - {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}" -{% endfor %} -{% endif %} - -# Configuration for telegraf itself -[agent] - interval = "{{ telegraf_agent_interval }}s" - debug = {{ telegraf_agent_debug | lower }} - hostname = "{{ ansible_fqdn }}" - -# Configuration for influxdb server to send metrics to -[outputs] -{% if telegraf_agent_output is defined and telegraf_agent_output is iterable %} -{% for item in telegraf_agent_output %} -[outputs.{{ item.type }}] -{% for items in item.config %} - {{ items }} -{% endfor %} -{% endfor %} -{% endif %} - -# PLUGINS -{% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %} -{% for item in telegraf_plugins_default %} -[{{ item.plugin }}] -{% if item.interval is defined %} - interval = "{{ item.interval }}s" -{% endif %} -{% if item.config is defined and item.config is iterable %} -{% for items in item.config %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.tagpass is defined and item.tagpass is iterable %} -[{{ item.plugin }}.tagpass] -{% for items in item.tagpass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.tagdrop is defined and item.tagdrop is iterable %} -[{{ item.plugin }}.tagdrop] -{% for items in item.tagdrop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.pass is defined and item.pass is iterable %} -[{{ item.plugin }}.pass] -{% for items in item.pass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.drop is defined and item.drop is iterable %} -[{{ item.plugin }}.drop] -{% for items in item.drop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.specifications is defined and item.specifications is iterable %} -[[{{item.plugin}}.specifications]] -{% for items in item.specifications %} - {{ items }} -{% endfor %} -{% endif %} - - -{% endfor %} -{% endif %} diff --git a/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2 deleted file mode 100644 index 452b722c..00000000 --- a/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2 +++ /dev/null @@ -1,47 +0,0 @@ -### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ### - -[[inputs.{{ item.value.plugin | default(item.key) }}]] -{% if item.value.interval is defined %} - interval = "{{ item.value.interval }}s" -{% endif %} -{% if item.value.config is defined and item.value.config is iterable %} -{% for items in item.value.config %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.tags is defined and item.value.tags is iterable %} -[inputs.{{ item.value.plugin | default(item.key) }}.tags] -{% for items in item.value.tags %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.tagpass is defined and item.value.tagpass is iterable %} -[{{ item.value.plugin | default(item.key) }}.tagpass] -{% for items in item.value.tagpass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.tagdrop is defined and item.value.tagdrop is iterable %} -[{{ item.value.plugin | default(item.key) }}.tagdrop] -{% for items in item.value.tagdrop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.pass is defined and item.value.pass is iterable %} -[{{ item.value.plugin | default(item.key) }}.pass] -{% for items in item.value.pass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.drop is defined and item.value.drop is iterable %} -[{{ item.value.plugin | default(item.key) }}.drop] -{% for items in item.value.drop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.value.specifications is defined and item.value.specifications is iterable %} -[[{{item.value.plugin | default(item.key)}}.specifications]] -{% for items in item.value.specifications %} - {{ items }} -{% endfor %} -{% endif %} diff --git a/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2 deleted file mode 100644 index ba426a9e..00000000 --- a/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2 +++ /dev/null @@ -1,100 +0,0 @@ -### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ### - -[global_tags] -{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %} -{% for item in telegraf_global_tags %} - {{ item.tag_name }} = "{{ item.tag_value }}" -{% endfor %} -{% endif %} - -{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %} -{% for key, value in ec2_tags.tags.items()%} - {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}" -{% endfor %} -{% endif %} - -# Configuration for telegraf agent -[agent] - interval = "{{ telegraf_agent_interval }}s" - debug = {{ telegraf_agent_debug | lower }} - hostname = "{{ telegraf_agent_hostname }}" - round_interval = {{ telegraf_agent_round_interval | lower }} - flush_interval = "{{ telegraf_agent_flush_interval }}s" - flush_jitter = "{{ telegraf_agent_flush_jitter }}s" -{% if telegraf_agent_version is version_compare('0.13', '>=') %} - collection_jitter = "{{ telegraf_agent_collection_jitter }}s" - metric_batch_size = {{ telegraf_agent_metric_batch_size }} - metric_buffer_limit = {{ telegraf_agent_metric_buffer_limit }} - quiet = {{ telegraf_agent_quiet | lower }} -{% endif %} -{% if telegraf_agent_version is version_compare('1.1', '>=') %} - logfile = "{{ telegraf_agent_logfile }}" - omit_hostname = {{ telegraf_agent_omit_hostname | lower }} -{% endif %} - -############################################################################### -# OUTPUTS # -############################################################################### - -{% if telegraf_agent_output is defined and telegraf_agent_output is iterable %} -{% for item in telegraf_agent_output %} -[[outputs.{{ item.type }}]] -{% for items in item.config %} - {{ items }} -{% endfor %} -{% endfor %} -{% endif %} - -############################################################################### -# INPUTS # -############################################################################### - -{% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %} -{% for item in telegraf_plugins_default %} -[[inputs.{{ item.plugin }}]] -{% if item.interval is defined %} - interval = "{{ item.interval }}s" -{% endif %} -{% if item.config is defined and item.config is iterable %} -{% for items in item.config %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.tags is defined and item.tags is iterable %} -[inputs.{{ item.plugin }}.tags] -{% for items in item.tags %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.tagpass is defined and item.tagpass is iterable %} -[{{ item.plugin }}.tagpass] -{% for items in item.tagpass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.tagdrop is defined and item.tagdrop is iterable %} -[{{ item.plugin }}.tagdrop] -{% for items in item.tagdrop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.pass is defined and item.pass is iterable %} -[{{ item.plugin }}.pass] -{% for items in item.pass %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.drop is defined and item.drop is iterable %} -[{{ item.plugin }}.drop] -{% for items in item.drop %} - {{ items }} -{% endfor %} -{% endif %} -{% if item.specifications is defined and item.specifications is iterable %} -[[{{item.plugin}}.specifications]] -{% for items in item.specifications %} - {{ items }} -{% endfor %} -{% endif %} -{% endfor %} -{% endif %} From 2104724cf9c9bdeca2910e84fd60e12ad534c997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 11:59:04 +0200 Subject: [PATCH 139/424] Remove unused `jenkins` Ansible role --- ansible-roles/jenkins/files/jenkins-v1.pub | 1 - ansible-roles/jenkins/files/jenkins-v2.pub | 1 - ansible-roles/jenkins/tasks/main.yml | 24 ---------------------- 3 files changed, 26 deletions(-) delete mode 100644 ansible-roles/jenkins/files/jenkins-v1.pub delete mode 100644 ansible-roles/jenkins/files/jenkins-v2.pub delete mode 100644 ansible-roles/jenkins/tasks/main.yml diff --git a/ansible-roles/jenkins/files/jenkins-v1.pub b/ansible-roles/jenkins/files/jenkins-v1.pub deleted file mode 100644 index 85cb44ed..00000000 --- a/ansible-roles/jenkins/files/jenkins-v1.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCijQFI17q5aExREX95V3r66c2OAp3MdWrLplDVy6Pfvfy8gINHLobtpO/tBxEtxvm/L6cTtiBKCHpwWkVLp+1Z6gpJumtITJXRkFbPUsFiOVbdgprwCbxD9J40RUxrD1Zz+hqbBiDuSttfc82Zzzh2vvYazHpzLgPHEeh+9a6IdbFbRIvf1FgdUoR1hUMmcHdAdvwrsLXaN0ZYa/XlAp+JPFAqZjL8HCiko3kMOq329thZJBEPBUdYE6IVrIke4uff1ONObnmaJYtburd8Z0bwaYNYbIce5yYH/V/oNAFUgL+mp55U+IJD4ju0gRbzR/ibc/E2yrdLXHGIY2z7hDZv jenkins@jenkins.denbi.uni-freiburg.de diff --git a/ansible-roles/jenkins/files/jenkins-v2.pub b/ansible-roles/jenkins/files/jenkins-v2.pub deleted file mode 100644 index 44e124c7..00000000 --- a/ansible-roles/jenkins/files/jenkins-v2.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV7gfNbNN5O8vH6/tM/iOFXKBP2YKRHXOmdfV8ogvu9BdVV0IPmDzk2EooVpThDE1VMv1hz3811tvBhHRJ6IgNhVIV/61w/+RazQD/AU27X8bX+Hb9EQ/bP4DW+6ySd/z5vdDLzpH5dbiMhzPEDkXVsylUT+hkQnas6cHspDhHmtKQ5MWOgDe3D/IEudTDJQe8hxxaU4TaZUmFzn7eYp9HvuK8qW0yCy4NWOxJJHA+G5wSCyLuKnaKo4AitUIzSKF1AB94oq7b96KONhPxgRptAk4OYIUTdNFbrI5HDaSNzHLnF5FbjQvG+Eu6m5nY5yvJMogE+jiuWeIXCZTCFljg287FUo0ohmbZpd802L6VXun14VumRC+rRgPrvBALo/CsyCsPIoBSTKhVElxKVOcRjmTLNfrUZM0GQxqJhIvah8BV+JTExkipPwkrKTdMAWIXvCoehxV+WMpBWqtEEzAzEoqJpaiec7HfriwsHTGESZWAPYEbFjzbHXQZtqBkbOvtokPMRmTWfWKxaplCMN6ddJeeY6faorD0w/e6lszWES1Q1ieajiPKDy37UvybKKvPTk4o3MzyzYOS4c8HQj+jnGeR5Q3ETuyz4psLyOfuBtIrfOeuxV42rFDmkYM3IrrRR+F9oklFG6Ig8DVfgQEzSG36NkgvpF4OdFvigYqXvw== jenkins@jenkins.denbi.uni-freiburg.de diff --git a/ansible-roles/jenkins/tasks/main.yml b/ansible-roles/jenkins/tasks/main.yml deleted file mode 100644 index 67c32b5d..00000000 --- a/ansible-roles/jenkins/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Install packages - yum: - name: "{{ item }}" - state: present - with_items: - - qemu-kvm - - qemu-img - - unzip - - seabios - - rubygems # should install ruby et al - - ruby - -- name: Download packer - shell: wget https://releases.hashicorp.com/packer/1.8.5/packer_1.8.5_linux_amd64.zip -O /tmp/packer.zip - -- name: Extract packer - shell: unzip /tmp/packer.zip -d /usr/bin - -- name: Adding existing user jenkins to group kvm - user: - name: jenkins - groups: kvm - append: yes From d3b3016dd378268318ea475124572297ca823828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 12:00:06 +0200 Subject: [PATCH 140/424] Rename `ansible-roles` directory to `ansible` --- {ansible-roles => ansible}/cloudinit/defaults/main.yml | 0 {ansible-roles => ansible}/cloudinit/tasks/main.yml | 0 {ansible-roles => ansible}/external.yml | 0 {ansible-roles => ansible}/files/daemon.json | 0 {ansible-roles => ansible}/files/server_ca | 0 {ansible-roles => ansible}/files/server_ca.pub | 0 {ansible-roles => ansible}/group_vars/all.yml | 0 {ansible-roles => ansible}/group_vars/condor.yml | 0 {ansible-roles => ansible}/group_vars/gpu.yml | 0 {ansible-roles => ansible}/group_vars/grub.yml | 0 {ansible-roles => ansible}/group_vars/java.yml | 0 {ansible-roles => ansible}/group_vars/pulsar.yml | 0 {ansible-roles => ansible}/internal.yml | 0 {ansible-roles => ansible}/lock-root/tasks/main.yml | 0 {ansible-roles => ansible}/run-playbook-only-internal.json | 0 {ansible-roles => ansible}/run-playbook-only.json | 0 {ansible-roles => ansible}/secret_group_vars/internal.yml | 0 {ansible-roles => ansible}/setup-generic.yml | 0 {ansible-roles => ansible}/setup-jenkins.yml | 0 {ansible-roles => ansible}/setup-vgcn-bwcloud-gpu.yml | 0 {ansible-roles => ansible}/setup-vgcn-bwcloud.yml | 0 .../usegalaxy-eu.logrotate/defaults/main.yml | 0 {ansible-roles => ansible}/usegalaxy-eu.logrotate/tasks/main.yml | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename {ansible-roles => ansible}/cloudinit/defaults/main.yml (100%) rename {ansible-roles => ansible}/cloudinit/tasks/main.yml (100%) rename {ansible-roles => ansible}/external.yml (100%) rename {ansible-roles => ansible}/files/daemon.json (100%) rename {ansible-roles => ansible}/files/server_ca (100%) rename {ansible-roles => ansible}/files/server_ca.pub (100%) rename {ansible-roles => ansible}/group_vars/all.yml (100%) rename {ansible-roles => ansible}/group_vars/condor.yml (100%) rename {ansible-roles => ansible}/group_vars/gpu.yml (100%) rename {ansible-roles => ansible}/group_vars/grub.yml (100%) rename {ansible-roles => ansible}/group_vars/java.yml (100%) rename {ansible-roles => ansible}/group_vars/pulsar.yml (100%) rename {ansible-roles => ansible}/internal.yml (100%) rename {ansible-roles => ansible}/lock-root/tasks/main.yml (100%) rename {ansible-roles => ansible}/run-playbook-only-internal.json (100%) rename {ansible-roles => ansible}/run-playbook-only.json (100%) rename {ansible-roles => ansible}/secret_group_vars/internal.yml (100%) rename {ansible-roles => ansible}/setup-generic.yml (100%) rename {ansible-roles => ansible}/setup-jenkins.yml (100%) rename {ansible-roles => ansible}/setup-vgcn-bwcloud-gpu.yml (100%) rename {ansible-roles => ansible}/setup-vgcn-bwcloud.yml (100%) rename {ansible-roles => ansible}/usegalaxy-eu.logrotate/defaults/main.yml (100%) rename {ansible-roles => ansible}/usegalaxy-eu.logrotate/tasks/main.yml (100%) diff --git a/ansible-roles/cloudinit/defaults/main.yml b/ansible/cloudinit/defaults/main.yml similarity index 100% rename from ansible-roles/cloudinit/defaults/main.yml rename to ansible/cloudinit/defaults/main.yml diff --git a/ansible-roles/cloudinit/tasks/main.yml b/ansible/cloudinit/tasks/main.yml similarity index 100% rename from ansible-roles/cloudinit/tasks/main.yml rename to ansible/cloudinit/tasks/main.yml diff --git a/ansible-roles/external.yml b/ansible/external.yml similarity index 100% rename from ansible-roles/external.yml rename to ansible/external.yml diff --git a/ansible-roles/files/daemon.json b/ansible/files/daemon.json similarity index 100% rename from ansible-roles/files/daemon.json rename to ansible/files/daemon.json diff --git a/ansible-roles/files/server_ca b/ansible/files/server_ca similarity index 100% rename from ansible-roles/files/server_ca rename to ansible/files/server_ca diff --git a/ansible-roles/files/server_ca.pub b/ansible/files/server_ca.pub similarity index 100% rename from ansible-roles/files/server_ca.pub rename to ansible/files/server_ca.pub diff --git a/ansible-roles/group_vars/all.yml b/ansible/group_vars/all.yml similarity index 100% rename from ansible-roles/group_vars/all.yml rename to ansible/group_vars/all.yml diff --git a/ansible-roles/group_vars/condor.yml b/ansible/group_vars/condor.yml similarity index 100% rename from ansible-roles/group_vars/condor.yml rename to ansible/group_vars/condor.yml diff --git a/ansible-roles/group_vars/gpu.yml b/ansible/group_vars/gpu.yml similarity index 100% rename from ansible-roles/group_vars/gpu.yml rename to ansible/group_vars/gpu.yml diff --git a/ansible-roles/group_vars/grub.yml b/ansible/group_vars/grub.yml similarity index 100% rename from ansible-roles/group_vars/grub.yml rename to ansible/group_vars/grub.yml diff --git a/ansible-roles/group_vars/java.yml b/ansible/group_vars/java.yml similarity index 100% rename from ansible-roles/group_vars/java.yml rename to ansible/group_vars/java.yml diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible/group_vars/pulsar.yml similarity index 100% rename from ansible-roles/group_vars/pulsar.yml rename to ansible/group_vars/pulsar.yml diff --git a/ansible-roles/internal.yml b/ansible/internal.yml similarity index 100% rename from ansible-roles/internal.yml rename to ansible/internal.yml diff --git a/ansible-roles/lock-root/tasks/main.yml b/ansible/lock-root/tasks/main.yml similarity index 100% rename from ansible-roles/lock-root/tasks/main.yml rename to ansible/lock-root/tasks/main.yml diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible/run-playbook-only-internal.json similarity index 100% rename from ansible-roles/run-playbook-only-internal.json rename to ansible/run-playbook-only-internal.json diff --git a/ansible-roles/run-playbook-only.json b/ansible/run-playbook-only.json similarity index 100% rename from ansible-roles/run-playbook-only.json rename to ansible/run-playbook-only.json diff --git a/ansible-roles/secret_group_vars/internal.yml b/ansible/secret_group_vars/internal.yml similarity index 100% rename from ansible-roles/secret_group_vars/internal.yml rename to ansible/secret_group_vars/internal.yml diff --git a/ansible-roles/setup-generic.yml b/ansible/setup-generic.yml similarity index 100% rename from ansible-roles/setup-generic.yml rename to ansible/setup-generic.yml diff --git a/ansible-roles/setup-jenkins.yml b/ansible/setup-jenkins.yml similarity index 100% rename from ansible-roles/setup-jenkins.yml rename to ansible/setup-jenkins.yml diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible/setup-vgcn-bwcloud-gpu.yml similarity index 100% rename from ansible-roles/setup-vgcn-bwcloud-gpu.yml rename to ansible/setup-vgcn-bwcloud-gpu.yml diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible/setup-vgcn-bwcloud.yml similarity index 100% rename from ansible-roles/setup-vgcn-bwcloud.yml rename to ansible/setup-vgcn-bwcloud.yml diff --git a/ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml b/ansible/usegalaxy-eu.logrotate/defaults/main.yml similarity index 100% rename from ansible-roles/usegalaxy-eu.logrotate/defaults/main.yml rename to ansible/usegalaxy-eu.logrotate/defaults/main.yml diff --git a/ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml b/ansible/usegalaxy-eu.logrotate/tasks/main.yml similarity index 100% rename from ansible-roles/usegalaxy-eu.logrotate/tasks/main.yml rename to ansible/usegalaxy-eu.logrotate/tasks/main.yml From 4428c895977a9fa86b949bdd8af33fb013a44368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 12:04:29 +0200 Subject: [PATCH 141/424] Move Ansible roles to a new directory `ansible/roles` --- ansible/{ => roles}/cloudinit/defaults/main.yml | 0 ansible/{ => roles}/cloudinit/tasks/main.yml | 0 ansible/{ => roles}/lock-root/tasks/main.yml | 0 ansible/{ => roles}/usegalaxy-eu.logrotate/defaults/main.yml | 0 ansible/{ => roles}/usegalaxy-eu.logrotate/tasks/main.yml | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename ansible/{ => roles}/cloudinit/defaults/main.yml (100%) rename ansible/{ => roles}/cloudinit/tasks/main.yml (100%) rename ansible/{ => roles}/lock-root/tasks/main.yml (100%) rename ansible/{ => roles}/usegalaxy-eu.logrotate/defaults/main.yml (100%) rename ansible/{ => roles}/usegalaxy-eu.logrotate/tasks/main.yml (100%) diff --git a/ansible/cloudinit/defaults/main.yml b/ansible/roles/cloudinit/defaults/main.yml similarity index 100% rename from ansible/cloudinit/defaults/main.yml rename to ansible/roles/cloudinit/defaults/main.yml diff --git a/ansible/cloudinit/tasks/main.yml b/ansible/roles/cloudinit/tasks/main.yml similarity index 100% rename from ansible/cloudinit/tasks/main.yml rename to ansible/roles/cloudinit/tasks/main.yml diff --git a/ansible/lock-root/tasks/main.yml b/ansible/roles/lock-root/tasks/main.yml similarity index 100% rename from ansible/lock-root/tasks/main.yml rename to ansible/roles/lock-root/tasks/main.yml diff --git a/ansible/usegalaxy-eu.logrotate/defaults/main.yml b/ansible/roles/usegalaxy-eu.logrotate/defaults/main.yml similarity index 100% rename from ansible/usegalaxy-eu.logrotate/defaults/main.yml rename to ansible/roles/usegalaxy-eu.logrotate/defaults/main.yml diff --git a/ansible/usegalaxy-eu.logrotate/tasks/main.yml b/ansible/roles/usegalaxy-eu.logrotate/tasks/main.yml similarity index 100% rename from ansible/usegalaxy-eu.logrotate/tasks/main.yml rename to ansible/roles/usegalaxy-eu.logrotate/tasks/main.yml From 25631ec4f7442eeda1fbad9b2ad6603767f3e8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 12:06:42 +0200 Subject: [PATCH 142/424] Remove `setup-` prefix from provisioning playbooks --- ansible/{setup-generic.yml => generic.yml} | 0 ansible/{setup-jenkins.yml => jenkins.yml} | 0 ansible/{setup-vgcn-bwcloud-gpu.yml => vgcn-bwcloud-gpu.yml} | 0 ansible/{setup-vgcn-bwcloud.yml => vgcn-bwcloud.yml} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename ansible/{setup-generic.yml => generic.yml} (100%) rename ansible/{setup-jenkins.yml => jenkins.yml} (100%) rename ansible/{setup-vgcn-bwcloud-gpu.yml => vgcn-bwcloud-gpu.yml} (100%) rename ansible/{setup-vgcn-bwcloud.yml => vgcn-bwcloud.yml} (100%) diff --git a/ansible/setup-generic.yml b/ansible/generic.yml similarity index 100% rename from ansible/setup-generic.yml rename to ansible/generic.yml diff --git a/ansible/setup-jenkins.yml b/ansible/jenkins.yml similarity index 100% rename from ansible/setup-jenkins.yml rename to ansible/jenkins.yml diff --git a/ansible/setup-vgcn-bwcloud-gpu.yml b/ansible/vgcn-bwcloud-gpu.yml similarity index 100% rename from ansible/setup-vgcn-bwcloud-gpu.yml rename to ansible/vgcn-bwcloud-gpu.yml diff --git a/ansible/setup-vgcn-bwcloud.yml b/ansible/vgcn-bwcloud.yml similarity index 100% rename from ansible/setup-vgcn-bwcloud.yml rename to ansible/vgcn-bwcloud.yml From c45dde05e97e3defa2ed221500346e48272f66ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Thu, 14 Sep 2023 12:57:09 +0200 Subject: [PATCH 143/424] Move templates and anaconda kickstart files to new folder `templates` --- .../anaconda-ks.cfg => templates/almacloud-8-anaconda-ks.cfg | 0 almacloud-8.x-x86_64.json => templates/almacloud-8-x86_64.json | 0 base.json => templates/base.json | 0 .../anaconda-ks.cfg => templates/centos-8-anaconda-ks.cfg | 0 centos-8.x-x86_64.json => templates/centos-8-x86_64.json | 0 .../anaconda-ks.cfg => templates/rockylinux-8-anaconda-ks.cfg | 0 rockylinux-8.x-x86_64.json => templates/rockylinux-8-x86_64.json | 0 .../anaconda-ks.cfg => templates/rockylinux-9-anaconda-ks.cfg | 0 rockylinux-9.x-x86_64.json => templates/rockylinux-9-x86_64.json | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename http/almacloud-8.x/anaconda-ks.cfg => templates/almacloud-8-anaconda-ks.cfg (100%) rename almacloud-8.x-x86_64.json => templates/almacloud-8-x86_64.json (100%) rename base.json => templates/base.json (100%) rename http/centos-8.x/anaconda-ks.cfg => templates/centos-8-anaconda-ks.cfg (100%) rename centos-8.x-x86_64.json => templates/centos-8-x86_64.json (100%) rename http/rockylinux-8.x/anaconda-ks.cfg => templates/rockylinux-8-anaconda-ks.cfg (100%) rename rockylinux-8.x-x86_64.json => templates/rockylinux-8-x86_64.json (100%) rename http/rockylinux-9.x/anaconda-ks.cfg => templates/rockylinux-9-anaconda-ks.cfg (100%) rename rockylinux-9.x-x86_64.json => templates/rockylinux-9-x86_64.json (100%) diff --git a/http/almacloud-8.x/anaconda-ks.cfg b/templates/almacloud-8-anaconda-ks.cfg similarity index 100% rename from http/almacloud-8.x/anaconda-ks.cfg rename to templates/almacloud-8-anaconda-ks.cfg diff --git a/almacloud-8.x-x86_64.json b/templates/almacloud-8-x86_64.json similarity index 100% rename from almacloud-8.x-x86_64.json rename to templates/almacloud-8-x86_64.json diff --git a/base.json b/templates/base.json similarity index 100% rename from base.json rename to templates/base.json diff --git a/http/centos-8.x/anaconda-ks.cfg b/templates/centos-8-anaconda-ks.cfg similarity index 100% rename from http/centos-8.x/anaconda-ks.cfg rename to templates/centos-8-anaconda-ks.cfg diff --git a/centos-8.x-x86_64.json b/templates/centos-8-x86_64.json similarity index 100% rename from centos-8.x-x86_64.json rename to templates/centos-8-x86_64.json diff --git a/http/rockylinux-8.x/anaconda-ks.cfg b/templates/rockylinux-8-anaconda-ks.cfg similarity index 100% rename from http/rockylinux-8.x/anaconda-ks.cfg rename to templates/rockylinux-8-anaconda-ks.cfg diff --git a/rockylinux-8.x-x86_64.json b/templates/rockylinux-8-x86_64.json similarity index 100% rename from rockylinux-8.x-x86_64.json rename to templates/rockylinux-8-x86_64.json diff --git a/http/rockylinux-9.x/anaconda-ks.cfg b/templates/rockylinux-9-anaconda-ks.cfg similarity index 100% rename from http/rockylinux-9.x/anaconda-ks.cfg rename to templates/rockylinux-9-anaconda-ks.cfg diff --git a/rockylinux-9.x-x86_64.json b/templates/rockylinux-9-x86_64.json similarity index 100% rename from rockylinux-9.x-x86_64.json rename to templates/rockylinux-9-x86_64.json From 6ac8ec1898d22b4f2eb9a57f4e39c63153635e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Tue, 19 Sep 2023 15:01:48 +0200 Subject: [PATCH 144/424] Migrate Packer templates to HCL2 Migrate all Packer templates to the second version of the Hashicorp Configuration Language, which is the preferred way to write Packer templates since version 1.7.0 of Packer. - Migrate all template contents to three HCL files: - "templates/sources.pkr.hcl": Configuration of the QEMU virtual machine that builds the images (Packer source). - "templates/build.pkr.hcl": Available builds, e.g. Rocky Linux 9.2, AlmaLinux 8.8. - "templates/variables.pkr.hcl": Variables of greatest interest, including the "groups" variable, which controls what playbooks are used to provision images. - Tweak names and ISO urls in the new templates to improve reproducibility (e.g. use AlmaLinux 8.8 ISO instead of AlmaLinux 8 ISO). - Delete Packer templates in JSON format. - Ensure there is a Kickstart file for each build. - Tweak Kickstart files to improve reproducibility: - Point AlmaLinux 8.8 Kickstart file to AlmaLinux 8.8 image instead of AlmaLinux 8 image. Do the same for repository urls. Install epel-release with yum (although it should not be necessary, it is already in the packages section). - Point Kickstart files for Rocky Linux EOL releases to Rocky Linux Vault. - Point CentOS 8.5.211 Kickstart file to a working url. Do the same for repository urls. Replace CentOS repository addresses with CentOS Vault. Install epel-release with yum (although it should not be necessary, it is already in the packages section). - Update provisioning playbooks: - Rename playbooks. - Change the hosts key from default to a value matching the name of each playbook (to let the "groups" variable control which playbooks are run). - Remove play names and playbook comments (they do not tell a consistent story when compared with the README.md, might be re-added later). - Remove Packer templates to run playbooks (they are no longer needed). - Delete Makefile (Packer does its job). - Add entries to .gitignore file. - Fix bug in jenkins.yml playbook: python36-virtualenv does not exist. Note that despite the changes, builds are not yet reproducible. For example, because the repos are not overriden with Rocky Linux vault repos for Rocky Linux 8.6, dnf updates upgrade the system to Rocky Linux 8.8. --- .gitignore | 6 +- Makefile | 143 ------------------ ansible/all-playbooks.yml | 20 +++ ansible/external.yml | 2 +- ansible/generic.yml | 5 +- ansible/internal.yml | 2 +- ansible/jenkins.yml | 6 +- ansible/run-playbook-only-internal.json | 33 ---- ansible/run-playbook-only.json | 36 ----- .../{vgcn-bwcloud-gpu.yml => workers-gpu.yml} | 4 +- ansible/{vgcn-bwcloud.yml => workers.yml} | 6 +- templates/almacloud-8-x86_64.json | 59 -------- ...g => almalinux-8.8-x86_64-anaconda-ks.cfg} | 13 +- templates/base.json | 9 -- templates/build.pkr.hcl | 110 ++++++++++++++ templates/centos-8-x86_64.json | 46 ------ templates/centos-8.5.2111-anaconda-ks.cfg | 63 ++++++++ templates/rockylinux-8-x86_64.json | 46 ------ ... => rockylinux-8.6-x86_64-anaconda-ks.cfg} | 2 +- templates/rockylinux-9-x86_64.json | 47 ------ ... => rockylinux-9.1-x86_64-anaconda-ks.cfg} | 15 +- ... => rockylinux-9.2-x86_64-anaconda-ks.cfg} | 0 templates/sources.pkr.hcl | 67 ++++++++ templates/variables.pkr.hcl | 28 ++++ 24 files changed, 318 insertions(+), 450 deletions(-) delete mode 100644 Makefile create mode 100644 ansible/all-playbooks.yml delete mode 100644 ansible/run-playbook-only-internal.json delete mode 100644 ansible/run-playbook-only.json rename ansible/{vgcn-bwcloud-gpu.yml => workers-gpu.yml} (97%) rename ansible/{vgcn-bwcloud.yml => workers.yml} (96%) delete mode 100644 templates/almacloud-8-x86_64.json rename templates/{almacloud-8-anaconda-ks.cfg => almalinux-8.8-x86_64-anaconda-ks.cfg} (76%) delete mode 100644 templates/base.json create mode 100644 templates/build.pkr.hcl delete mode 100644 templates/centos-8-x86_64.json create mode 100644 templates/centos-8.5.2111-anaconda-ks.cfg delete mode 100644 templates/rockylinux-8-x86_64.json rename templates/{rockylinux-8-anaconda-ks.cfg => rockylinux-8.6-x86_64-anaconda-ks.cfg} (95%) delete mode 100644 templates/rockylinux-9-x86_64.json rename templates/{centos-8-anaconda-ks.cfg => rockylinux-9.1-x86_64-anaconda-ks.cfg} (77%) rename templates/{rockylinux-9-anaconda-ks.cfg => rockylinux-9.2-x86_64-anaconda-ks.cfg} (100%) create mode 100644 templates/sources.pkr.hcl create mode 100644 templates/variables.pkr.hcl diff --git a/.gitignore b/.gitignore index 3e39dc4f..006a1d22 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,10 @@ packer_cache/ *.box # End of https://www.gitignore.io/api/packer -centos-7.3-x86_64 + .vault_pass +.vault_password *.retry .venv -centos-7.x-x86_64/ + +.idea \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 5d3961d9..00000000 --- a/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -# Simple Makefile to build base VM images using packer and ansible -# TODO -# * support ssh per user instead of root -# * support building with non-qemu builders and convert to qemu afterwards -# * testing target -# * auto-detect flavors - -PACKER := $(shell which packer) -ifdef ${PACKER_PATH} - PACKER = ${PACKER_PATH} -endif -ifndef PACKER - $(error packer not found, please install it) -endif - - -ANSIBLE_DIR=ansible-roles -# the "provisioning" flavor, expects a 'setup-.yml' playbook -# in the 'ansible-roles' submodule! This will likely change... -FLAVORS = vgcn-bwcloud vgcn-bwcloud-gpu jenkins generic -SUPPORTED_BUILDERS = qemu -# check which hypervisors are available -ifeq ($(shell which qemu-system-$(shell uname -m | sed 's/i686/i386/') 2>&1 > /dev/null && echo $$?), 0) -AVAILABLE_BUILDERS += qemu -BUILDER := qemu -endif - -TEMPLATES := $(basename $(filter-out base.json,$(wildcard *.json))) - -BASETARGETS := $(foreach template, $(TEMPLATES), $(template)/base) -PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor))) -INTERNALTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor)-internal)) -EXTERNALTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor)-external)) - -PACKER_OPTS := -var-file=base.json -ifdef DEBUG - PACKER_OPTS += -debug - PACKER_OPTS += -var='headless=false' -endif - -.PHONY: all help clean -all: help - -## -# Creating base images -## -$(BASETARGETS): - $(info ** Building template '$(@D)' using '$(BUILDER)' **) - $(PACKER) build -only=$(BUILDER) \ - $(PACKER_OPTS) \ - -var='vm_name=$(@D)' \ - $(@D).json - @test -f output-$(@D)-$(BUILDER)/$(@D) || false - @-test -d $(@D)/base && rm -rf $(@D)/base - @-mkdir $(@D) - @mv output-$(@D)-$(BUILDER) $(@D)/base - @mv $(@D)/base/$(@D) $(@D)/base/image - @echo "** Success **" - -## -# Provisioning images -## -$(PROVTARGETS): deps -$(foreach flav, $(FLAVORS), %/$(flav)): %/base - $(info ** Provisioning '$(@D)' with '$(@F)' **) - $(PACKER) build -only=$(BUILDER) \ - $(PACKER_OPTS) \ - -var='vm_name=$(@F)' \ - -var='image_dir=$(@D)' \ - -var='image_name=base/image' \ - -var='playbook=setup-$(@F).yml' \ - $(ANSIBLE_DIR)/run-playbook-only.json - @test -f output-$(@D)/$(@F) || false - @-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F) - @-mkdir $(@D)/$(@F) - @mv output-$(@D)/$(@F) $(@D)/$(@F)/image - @rmdir output-$(@D) - @echo "** Success **" - - -# Internal image version -$(INTERNALTARGETS): -$(foreach flav, $(FLAVORS), %/$(flav)-internal): # bug: doesn't do deps right. - $(info ** Provisioning '$(@D)' with '$(@F)' **) - $(PACKER) build -only=$(BUILDER) \ - $(PACKER_OPTS) \ - -var='vm_name=$(@F)' \ - -var='image_dir=$(@D)' \ - -var='image_name=$(subst -internal,,$(@F))/image' \ - -var='playbook=internal.yml' \ - $(ANSIBLE_DIR)/run-playbook-only-internal.json - @test -f output-$(@D)/$(@F) || false - @-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F) - @-mkdir $(@D)/$(@F) - @mv output-$(@D)/$(@F) $(@D)/$(@F)/image - @rmdir output-$(@D) - @echo "** Success **" - -# external image version -$(EXTERNALTARGETS): -$(foreach flav, $(FLAVORS), %/$(flav)-external): # bug: doesn't do deps right. - $(info ** Provisioning '$(@D)' with '$(@F)' **) - $(PACKER) build -only=$(BUILDER) \ - $(PACKER_OPTS) \ - -var='vm_name=$(@F)' \ - -var='image_dir=$(@D)' \ - -var='image_name=$(subst -external,,$(@F))/image' \ - -var='playbook=external.yml' \ - $(ANSIBLE_DIR)/run-playbook-only.json - @test -f output-$(@D)/$(@F) || false - @-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F) - @-mkdir $(@D)/$(@F) - @mv output-$(@D)/$(@F) $(@D)/$(@F)/image - @rmdir output-$(@D) - @echo "** Success **" - -help: - @echo "General syntax: