From 7084f25da6fe4895233c3fa66e793118e6ca59d9 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 21:33:33 -0300 Subject: [PATCH 01/11] add .vscode to .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b426938..c265975a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ terraform.tfstate.backup # Environment/key files .envrc +# VSCode +.vscode + # ssh id_rsa id_rsa.pub @@ -21,4 +24,4 @@ inventory # nix .direnv -shell.nix \ No newline at end of file +shell.nix From 06bb8ec70611cfd0ecacbdf7b6c5c1b4f4c7ce03 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 21:35:49 -0300 Subject: [PATCH 02/11] remove unnecessary 'cmd' field from service configuration --- roles/cifs/handlers/main.yaml | 1 - roles/dask_gateway/handlers/main.yaml | 1 - roles/jupyterhub/handlers/main.yaml | 3 --- roles/mysql/handlers/main.yaml | 1 - roles/openldap/handlers/main.yaml | 1 - roles/postgresql/handlers/main.yaml | 1 - roles/traefik/handlers/main.yaml | 1 - 7 files changed, 9 deletions(-) diff --git a/roles/cifs/handlers/main.yaml b/roles/cifs/handlers/main.yaml index fcd0b3cc..c66ca20a 100644 --- a/roles/cifs/handlers/main.yaml +++ b/roles/cifs/handlers/main.yaml @@ -5,6 +5,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - smbd diff --git a/roles/dask_gateway/handlers/main.yaml b/roles/dask_gateway/handlers/main.yaml index 7c083370..9ecb4de8 100644 --- a/roles/dask_gateway/handlers/main.yaml +++ b/roles/dask_gateway/handlers/main.yaml @@ -5,6 +5,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - dask-gateway diff --git a/roles/jupyterhub/handlers/main.yaml b/roles/jupyterhub/handlers/main.yaml index c27dcd6d..07a5fd09 100644 --- a/roles/jupyterhub/handlers/main.yaml +++ b/roles/jupyterhub/handlers/main.yaml @@ -5,7 +5,6 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - jupyterhub @@ -15,7 +14,6 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - jupyterhub-proxy @@ -25,6 +23,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - jupyterhub-ssh diff --git a/roles/mysql/handlers/main.yaml b/roles/mysql/handlers/main.yaml index 96781a56..a89efe3b 100644 --- a/roles/mysql/handlers/main.yaml +++ b/roles/mysql/handlers/main.yaml @@ -5,6 +5,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - mysql diff --git a/roles/openldap/handlers/main.yaml b/roles/openldap/handlers/main.yaml index bca5e5b4..ca5c23bf 100644 --- a/roles/openldap/handlers/main.yaml +++ b/roles/openldap/handlers/main.yaml @@ -6,7 +6,6 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - nscd - nslcd diff --git a/roles/postgresql/handlers/main.yaml b/roles/postgresql/handlers/main.yaml index e59eec69..393c4b69 100644 --- a/roles/postgresql/handlers/main.yaml +++ b/roles/postgresql/handlers/main.yaml @@ -5,6 +5,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - postgresql diff --git a/roles/traefik/handlers/main.yaml b/roles/traefik/handlers/main.yaml index c52eac80..2ff770f8 100644 --- a/roles/traefik/handlers/main.yaml +++ b/roles/traefik/handlers/main.yaml @@ -5,6 +5,5 @@ name: "{{ item }}" enabled: "yes" state: restarted - cmd: "" with_items: - traefik From 2d664e7a9c15a5434423c0c87f466c06d0ce3e0b Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 21:36:54 -0300 Subject: [PATCH 03/11] capitalize restart services notifications for consistency with handlers --- roles/dask_gateway/tasks/dask_gateway.yaml | 4 ++-- roles/mysql/tasks/mysql.yaml | 2 +- roles/openldap/tasks/client.yaml | 8 ++++---- roles/traefik/tasks/traefik.yaml | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/dask_gateway/tasks/dask_gateway.yaml b/roles/dask_gateway/tasks/dask_gateway.yaml index fb364c30..6ce9110b 100644 --- a/roles/dask_gateway/tasks/dask_gateway.yaml +++ b/roles/dask_gateway/tasks/dask_gateway.yaml @@ -49,7 +49,7 @@ owner: dask group: dask mode: "0644" - notify: restart services dask-gateway + notify: Restart services dask-gateway - name: Copy the dask-gateway systemd service file become: true @@ -77,7 +77,7 @@ owner: root group: root mode: "0644" - notify: restart services dask-gateway + notify: Restart services dask-gateway - name: Ensure dask-gateway is enabled on boot become: true diff --git a/roles/mysql/tasks/mysql.yaml b/roles/mysql/tasks/mysql.yaml index 19f565f0..b30669f9 100644 --- a/roles/mysql/tasks/mysql.yaml +++ b/roles/mysql/tasks/mysql.yaml @@ -20,7 +20,7 @@ mode: "0644" backup: true with_dict: "{{ mysql_config }}" - notify: restart services mysql + notify: Restart services mysql - name: Create mysql database become: true diff --git a/roles/openldap/tasks/client.yaml b/roles/openldap/tasks/client.yaml index 80503277..5deb0ae7 100644 --- a/roles/openldap/tasks/client.yaml +++ b/roles/openldap/tasks/client.yaml @@ -15,7 +15,7 @@ regexp: pam_mkhomedir\.so line: session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 state: present - notify: restart services ldap + notify: Restart services ldap - name: LDAP Authentication | Query ldap in nsswitch.conf become: true @@ -28,7 +28,7 @@ - passwd - shadow - group - notify: restart services ldap + notify: Restart services ldap - name: LDAP Authentication | no cache for ldap in nscd.conf become: true @@ -40,7 +40,7 @@ with_items: - passwd - group - notify: restart services ldap + notify: Restart services ldap - name: LDAP Authentication | Configure /etc/nslcd.conf become: true @@ -48,4 +48,4 @@ src: nslcd.conf.j2 dest: /etc/nslcd.conf mode: "0600" - notify: restart services ldap + notify: Restart services ldap diff --git a/roles/traefik/tasks/traefik.yaml b/roles/traefik/tasks/traefik.yaml index 48329849..b3e303ab 100644 --- a/roles/traefik/tasks/traefik.yaml +++ b/roles/traefik/tasks/traefik.yaml @@ -89,7 +89,7 @@ owner: traefik group: traefik when: traefik_tls_certificate is defined - notify: restart services traefik + notify: Restart services traefik register: _traefik_tls_certificate - name: Copy TLS key if provided @@ -102,7 +102,7 @@ owner: traefik group: traefik when: traefik_tls_key is defined - notify: restart services traefik + notify: Restart services traefik register: _traefik_tls_key - name: Copy traefik configuration @@ -113,7 +113,7 @@ mode: "0600" owner: traefik group: traefik - notify: restart services traefik + notify: Restart services traefik - name: Copy traefik dynamic configuration become: true @@ -123,7 +123,7 @@ mode: "0600" owner: traefik group: traefik - notify: restart services traefik + notify: Restart services traefik - name: Copy the traefik systemd service file become: true @@ -155,7 +155,7 @@ owner: root group: root mode: "0644" - notify: restart services traefik + notify: Restart services traefik - name: Ensure Traefik is enabled on boot become: true From 2894bdee5e3b84939469aa40b12317b85fec1fc8 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 22:27:25 -0300 Subject: [PATCH 04/11] update slurm configuration file paths and permissions --- roles/slurm/defaults/main.yml | 2 ++ roles/slurm/tasks/main.yaml | 8 ++++---- roles/slurm/tasks/slurmctld.yaml | 12 +++++++++--- roles/slurm/tasks/slurmd.yaml | 8 +++++++- roles/slurm/tasks/slurmdbd.yaml | 12 +++++++++--- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml index 5fa83f95..25a5363f 100644 --- a/roles/slurm/defaults/main.yml +++ b/roles/slurm/defaults/main.yml @@ -6,6 +6,8 @@ slurmd_enabled: false slurmctld_enabled: false slurmdbd_enabled: false +SlurmConfigFileDIr: /etc/slurm-llnl + slurm_config: ClusterName: cluster # slurmctld options diff --git a/roles/slurm/tasks/main.yaml b/roles/slurm/tasks/main.yaml index 091f8f11..82723852 100644 --- a/roles/slurm/tasks/main.yaml +++ b/roles/slurm/tasks/main.yaml @@ -15,7 +15,7 @@ - name: Ensure that slurm configuration directory exists become: true ansible.builtin.file: - path: /etc/slurm + path: "{{ SlurmConfigFileDIr }}" state: directory mode: "0755" owner: root @@ -25,10 +25,10 @@ become: true ansible.builtin.template: src: templates/slurm.conf - dest: /etc/slurm/slurm.conf + dest: "{{ SlurmConfigFileDIr }}/slurm.conf" owner: root group: root - mode: "0444" + mode: "0755" register: _slurm_config - name: Install extra execution host configs @@ -39,7 +39,7 @@ ConstrainCores=yes ConstrainRAMSpace=yes ConstrainSwapSpace=yes - dest: /etc/slurm/cgroup.conf + dest: "{{ SlurmConfigFileDIr }}/cgroup.conf" owner: root group: root mode: "0444" diff --git a/roles/slurm/tasks/slurmctld.yaml b/roles/slurm/tasks/slurmctld.yaml index 0eae5e4a..2054ad13 100644 --- a/roles/slurm/tasks/slurmctld.yaml +++ b/roles/slurm/tasks/slurmctld.yaml @@ -1,22 +1,28 @@ --- +# Must be writable by user SlurmUser. +# The file must be accessible by the primary and backup control machines. - name: Ensure slurm state directory exists become: true ansible.builtin.file: path: "{{ slurm_config.StateSaveLocation }}" state: directory - mode: "0700" + mode: "0755" owner: slurm group: slurm +# Must be writable by user SlurmUser. +# The file must be accessible by the primary and backup control machines. - name: Ensure slurm log directory exists become: true ansible.builtin.file: path: "{{ slurm_config.SlurmctldLogFile | dirname }}" state: directory - mode: "0700" + mode: "0755" owner: slurm group: slurm +# Must be writable by user root. Preferably writable and removable by SlurmUser. +# The file must be accessible by the primary and backup control machines. - name: Ensure slurm pid directory exists become: true ansible.builtin.file: @@ -33,7 +39,7 @@ [Unit] Description=Slurm controller daemon After=network.target munge.service - ConditionPathExists=/etc/slurm/slurm.conf + ConditionPathExists={{ SlurmConfigFileDIr }}/slurm.conf [Service] Type=forking diff --git a/roles/slurm/tasks/slurmd.yaml b/roles/slurm/tasks/slurmd.yaml index 7105c146..b44ec6b0 100644 --- a/roles/slurm/tasks/slurmd.yaml +++ b/roles/slurm/tasks/slurmd.yaml @@ -1,4 +1,6 @@ --- +# Permissions must be set to 755 so that job scripts can be executed from this directory. +# A distinct file must exist on each compute node. - name: Create slurm spool directory become: true ansible.builtin.file: @@ -8,6 +10,8 @@ mode: "0755" state: directory +# Must be writable by user root. +# A distinct file must exist on each compute node. - name: Create slurm log directory become: true ansible.builtin.file: @@ -17,6 +21,8 @@ mode: "0755" state: directory +# Must be writable by user root. +# A distinct file must exist on each compute node. - name: Ensure slurm pid directory exists become: true ansible.builtin.file: @@ -33,7 +39,7 @@ [Unit] Description=Slurm node daemon After=network.target munge.service remote-fs.target - ConditionPathExists=/etc/slurm/slurm.conf + ConditionPathExists={{ SlurmConfigFileDIr }}/slurm.conf [Service] Type=forking diff --git a/roles/slurm/tasks/slurmdbd.yaml b/roles/slurm/tasks/slurmdbd.yaml index 3cf1f7e7..322ef6fe 100644 --- a/roles/slurm/tasks/slurmdbd.yaml +++ b/roles/slurm/tasks/slurmdbd.yaml @@ -1,13 +1,15 @@ --- +# Must be writable by user SlurmUser. - name: Ensure slurmdbd log directory exists become: true ansible.builtin.file: path: "{{ slurmdbd_config.LogFile | dirname }}" state: directory - mode: "0700" + mode: "0755" owner: slurm group: slurm +# Must be writable by user SlurmUser. - name: Ensure slurm pid directory exists become: true ansible.builtin.file: @@ -17,11 +19,15 @@ owner: slurm group: slurm +# This file should be only on the computer where SlurmDBD executes +# and should only be readable by the user which executes SlurmDBD (e.g. "slurm"). +# This file should be protected from unauthorized access since +# it contains a database password - name: Install slurmdbd.conf become: true ansible.builtin.template: src: templates/slurmdbd.conf - dest: /etc/slurm/slurmdbd.conf + dest: "{{ SlurmConfigFileDIr }}/slurmdbd.conf" owner: slurm group: slurm mode: "0600" @@ -34,7 +40,7 @@ [Unit] Description=Slurm DBD accounting daemon After=network.target munge.service - ConditionPathExists=/etc/slurm/slurmdbd.conf + ConditionPathExists={{ SlurmConfigFileDIr }}/slurmdbd.conf [Service] Type=forking From e8018d6553c0417f90f9788b03287bf70fc5768d Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 22:29:15 -0300 Subject: [PATCH 05/11] update dependencies for dask-gateway-server as original issue was addressed --- .../templates/environments/dask-gateway.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/roles/dask_gateway/templates/environments/dask-gateway.yaml b/roles/dask_gateway/templates/environments/dask-gateway.yaml index 25f5a9b8..6b0de3e6 100644 --- a/roles/dask_gateway/templates/environments/dask-gateway.yaml +++ b/roles/dask_gateway/templates/environments/dask-gateway.yaml @@ -2,10 +2,6 @@ name: dask-gateway channels: - conda-forge dependencies: - # had to install dask-gateway-server via pip due to - # conda-forge install issue - # https://github.com/dask/dask-gateway/issues/366 - - pip - - pip: - - dask-gateway-server - - sqlalchemy + - python + - dask-gateway-server-jobqueue + - sqlalchemy From e82ff7a53f6a9987cdd640158df5b8f1dfa6e6d1 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" Date: Thu, 29 Feb 2024 22:29:29 -0300 Subject: [PATCH 06/11] add missing line breaks for readability --- roles/openldap/tasks/openldap.yaml | 1 + roles/slurm/tasks/slurm_exporter.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/openldap/tasks/openldap.yaml b/roles/openldap/tasks/openldap.yaml index 3719f3ce..95cf65d7 100644 --- a/roles/openldap/tasks/openldap.yaml +++ b/roles/openldap/tasks/openldap.yaml @@ -47,6 +47,7 @@ - name: Load ddbb template into ldap become: true ansible.builtin.command: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/db.ldif + - name: Load ldap root entry community.general.ldap_entry: server_uri: "{{ openldap_server_uri }}" diff --git a/roles/slurm/tasks/slurm_exporter.yaml b/roles/slurm/tasks/slurm_exporter.yaml index dd595cc9..da14ae97 100644 --- a/roles/slurm/tasks/slurm_exporter.yaml +++ b/roles/slurm/tasks/slurm_exporter.yaml @@ -1,6 +1,7 @@ --- - name: Install golang ansible.builtin.include_tasks: golang.yaml + - name: Check that the slurm exporter binary exists ansible.builtin.stat: path: /usr/local/bin/prometheus_slurm_exporter From e8caa0fd20a04da02b9af4be1766a63bd91b72ed Mon Sep 17 00:00:00 2001 From: vinicius douglas cerutti Date: Wed, 6 Mar 2024 10:18:40 -0300 Subject: [PATCH 07/11] direct ansible deploy --- .github/kvm/inventory.ini | 7 ++++++ .github/workflows/kvm-test.yaml | 43 ++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 .github/kvm/inventory.ini diff --git a/.github/kvm/inventory.ini b/.github/kvm/inventory.ini new file mode 100644 index 00000000..433e0cb4 --- /dev/null +++ b/.github/kvm/inventory.ini @@ -0,0 +1,7 @@ +hpc01-test + +[hpc_master] +hpc01-test + +[hpc_worker] +hpc01-test diff --git a/.github/workflows/kvm-test.yaml b/.github/workflows/kvm-test.yaml index ea8fa2c8..0fa1e687 100644 --- a/.github/workflows/kvm-test.yaml +++ b/.github/workflows/kvm-test.yaml @@ -13,29 +13,34 @@ jobs: name: KVM Test runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Cache Vagrant boxes - uses: actions/cache@v2 + - uses: actions/setup-python@v5 with: - path: ~/.vagrant.d/boxes - key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} - restore-keys: | - ${{ runner.os }}-vagrant- + python-version: "3.10" + cache: "pip" - - name: Install test dependencies. - run: sudo pip3 install ansible + - name: Install dependencies + run: | + pip install ansible - - name: Install Ansible Dependencies - working-directory: tests/ubuntu2004-singlenode + - name: Install Ansible dependencies run: | - ansible-galaxy collection install community.general - ansible-galaxy collection install ansible.posix + ansible-galaxy collection install -r requirements.yaml - - name: Show Vagrant version - run: vagrant --version + - name: Create deploy folder and move inventory files + run: | + mkdir deploy + cp -r inventory.template/* deploy/ + cp .github/workflows/inventory.ini deploy/inventory.ini -# Disabled until we fix it -# - name: Run vagrant up -# working-directory: tests/ubuntu2004-singlenode -# run: vagrant up + - name: Update firwall_internal_ip_range + run: | + echo "firewall_internal_ip_range: $(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" >> deploy/group_vars/all.yaml + + - name: Run ansible playbook + run: | + cd deploy + ansible-playbook ../playbook.yaml -i inventory.ini --connection=local -v + env: + ANSIBLE_FORCE_COLOR: True From 5e04182eafda570d000b19061cb1e652d1514157 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" <51954708+viniciusdc@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:54:45 -0300 Subject: [PATCH 08/11] Delete .github/kvm/inventory.ini --- .github/kvm/inventory.ini | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .github/kvm/inventory.ini diff --git a/.github/kvm/inventory.ini b/.github/kvm/inventory.ini deleted file mode 100644 index 433e0cb4..00000000 --- a/.github/kvm/inventory.ini +++ /dev/null @@ -1,7 +0,0 @@ -hpc01-test - -[hpc_master] -hpc01-test - -[hpc_worker] -hpc01-test From e6e8c295b2d8d51784873c2fc76c5bb88087d667 Mon Sep 17 00:00:00 2001 From: "Vinicius D. Cerutti" <51954708+viniciusdc@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:54:55 -0300 Subject: [PATCH 09/11] Delete .github/workflows/kvm-test.yaml --- .github/workflows/kvm-test.yaml | 46 --------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/kvm-test.yaml diff --git a/.github/workflows/kvm-test.yaml b/.github/workflows/kvm-test.yaml deleted file mode 100644 index 0fa1e687..00000000 --- a/.github/workflows/kvm-test.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Vagrant (KVM) Tests - -on: - pull_request: - push: - branches: - - main - -jobs: - # https://github.com/jonashackt/vagrant-github-actions - test-kvm: - name: KVM Test - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: "3.10" - cache: "pip" - - - name: Install dependencies - run: | - pip install ansible - - - name: Install Ansible dependencies - run: | - ansible-galaxy collection install -r requirements.yaml - - - name: Create deploy folder and move inventory files - run: | - mkdir deploy - cp -r inventory.template/* deploy/ - cp .github/workflows/inventory.ini deploy/inventory.ini - - - name: Update firwall_internal_ip_range - run: | - echo "firewall_internal_ip_range: $(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" >> deploy/group_vars/all.yaml - - - name: Run ansible playbook - run: | - cd deploy - ansible-playbook ../playbook.yaml -i inventory.ini --connection=local -v - env: - ANSIBLE_FORCE_COLOR: True From a7ded2125ee18cac48127dfac31637829cc4ead8 Mon Sep 17 00:00:00 2001 From: vinicius douglas cerutti Date: Fri, 15 Mar 2024 10:58:09 -0300 Subject: [PATCH 10/11] add back kvm tests --- .github/workflows/kvm-test.yaml | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/kvm-test.yaml diff --git a/.github/workflows/kvm-test.yaml b/.github/workflows/kvm-test.yaml new file mode 100644 index 00000000..eec2332a --- /dev/null +++ b/.github/workflows/kvm-test.yaml @@ -0,0 +1,41 @@ +--- + name: Vagrant (KVM) Tests + + on: + pull_request: + push: + branches: + - main + + jobs: + # https://github.com/jonashackt/vagrant-github-actions + test-kvm: + name: KVM Test + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + + - name: Cache Vagrant boxes + uses: actions/cache@v2 + with: + path: ~/.vagrant.d/boxes + key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} + restore-keys: | + ${{ runner.os }}-vagrant- + + - name: Install test dependencies. + run: sudo pip3 install ansible + + - name: Install Ansible Dependencies + working-directory: tests/ubuntu2004-singlenode + run: | + ansible-galaxy collection install community.general + ansible-galaxy collection install ansible.posix + + - name: Show Vagrant version + run: vagrant --version + + # Disabled until we fix it + # - name: Run vagrant up + # working-directory: tests/ubuntu2004-singlenode + # run: vagrant up From e6cb3ebcc6f65eb0ab843e8aad28e0d7caf772db Mon Sep 17 00:00:00 2001 From: vinicius douglas cerutti Date: Fri, 15 Mar 2024 11:00:33 -0300 Subject: [PATCH 11/11] fix identation changes on workflow --- .github/workflows/kvm-test.yaml | 66 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/kvm-test.yaml b/.github/workflows/kvm-test.yaml index eec2332a..ea8fa2c8 100644 --- a/.github/workflows/kvm-test.yaml +++ b/.github/workflows/kvm-test.yaml @@ -1,41 +1,41 @@ --- - name: Vagrant (KVM) Tests +name: Vagrant (KVM) Tests - on: - pull_request: - push: - branches: - - main +on: + pull_request: + push: + branches: + - main - jobs: - # https://github.com/jonashackt/vagrant-github-actions - test-kvm: - name: KVM Test - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 +jobs: + # https://github.com/jonashackt/vagrant-github-actions + test-kvm: + name: KVM Test + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 - - name: Cache Vagrant boxes - uses: actions/cache@v2 - with: - path: ~/.vagrant.d/boxes - key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} - restore-keys: | - ${{ runner.os }}-vagrant- + - name: Cache Vagrant boxes + uses: actions/cache@v2 + with: + path: ~/.vagrant.d/boxes + key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} + restore-keys: | + ${{ runner.os }}-vagrant- - - name: Install test dependencies. - run: sudo pip3 install ansible + - name: Install test dependencies. + run: sudo pip3 install ansible - - name: Install Ansible Dependencies - working-directory: tests/ubuntu2004-singlenode - run: | - ansible-galaxy collection install community.general - ansible-galaxy collection install ansible.posix + - name: Install Ansible Dependencies + working-directory: tests/ubuntu2004-singlenode + run: | + ansible-galaxy collection install community.general + ansible-galaxy collection install ansible.posix - - name: Show Vagrant version - run: vagrant --version + - name: Show Vagrant version + run: vagrant --version - # Disabled until we fix it - # - name: Run vagrant up - # working-directory: tests/ubuntu2004-singlenode - # run: vagrant up +# Disabled until we fix it +# - name: Run vagrant up +# working-directory: tests/ubuntu2004-singlenode +# run: vagrant up