1
1
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/infrastructure.git synced 2024-05-26 00:16:05 +02:00

lint: apply a few key-order[task] recommendations

Ordering "when:" before "block:" makes it more readable I suppose.
This commit is contained in:
Evangelos Foutras 2022-09-24 07:12:10 +03:00
parent 6468250515
commit 6a486f28e5
No known key found for this signature in database
GPG Key ID: 51E8B148A9999C34
4 changed files with 7 additions and 7 deletions

View File

@ -61,6 +61,7 @@
systemd: name=gitlab-runner state=started enabled=yes daemon_reload=yes
- name: Setup libvirt-executor
when: "'gitlab_vm_runners' in group_names"
block:
- name: Install libvirt-executor-update-base-image dependencies
pacman: name=arch-install-scripts,sequoia-sq state=present
@ -92,4 +93,3 @@
- name: Enable and start libvirt-executor-update-base-image.timer
systemd: name=libvirt-executor-update-base-image.timer state=started enabled=yes daemon_reload=yes
when: "'gitlab_vm_runners' in group_names"

View File

@ -82,6 +82,9 @@
changed_when: "chroot_pacman_key_populate.rc == 0"
- name: Install ucode update
when:
- "'hcloud' not in group_names"
- inventory_hostname != 'packer-base-image'
block:
- name: Install ucode update for Intel
set_fact: ucode="intel-ucode"
@ -90,9 +93,6 @@
- name: Install ucode update for AMD
set_fact: ucode="amd-ucode"
when: "'AuthenticAMD' in ansible_facts['processor']"
when:
- "'hcloud' not in group_names"
- inventory_hostname != 'packer-base-image'
- name: Install arch base from bootstrap chroot
command: chroot /tmp/root.x86_64 pacstrap /mnt base linux btrfs-progs grub openssh python-requests python-yaml inetutils {{ ucode | default('') }}

View File

@ -27,6 +27,7 @@
service_facts:
- name: Create an admin user when first starting keycloak
when: ansible_facts.services["keycloak.service"]["state"] != "running"
block:
- name: Install admin creation drop-in for keycloak.service
copy: src=create-keycloak-admin.conf dest=/etc/systemd/system/keycloak.service.d/ owner=root group=root mode=0644
@ -48,7 +49,6 @@
file: path=/etc/systemd/system/keycloak.service.d/create-keycloak-admin.conf state=absent
notify:
- Daemon reload
when: ansible_facts.services["keycloak.service"]["state"] != "running"
- name: Open firewall hole
ansible.posix.firewalld: port={{ item }} permanent=true state=enabled immediate=yes

View File

@ -1,4 +1,5 @@
- name: Configure network (static)
when: not dhcp | default(false)
block:
- name: Install 10-static-ethernet.network
template: src=10-static-ethernet.network.j2 dest={{ chroot_path }}/etc/systemd/network/10-static-ethernet.network owner=root group=root mode=0644
@ -13,9 +14,9 @@
notify:
- Restart networkd
when: static_dns | default(true)
when: not dhcp | default(false)
- name: Configure network (dhcp)
when: dhcp | default(false)
block:
- name: Install 10-dhcp-ethernet.network
template: src=10-dhcp-ethernet.network.j2 dest={{ chroot_path }}/etc/systemd/network/10-dhcp-ethernet.network owner=root group=root mode=0644
@ -30,7 +31,6 @@
notify:
- Restart networkd
when: static_dns | default(false)
when: dhcp | default(false)
- name: Create symlink to resolv.conf
file: src=/run/systemd/resolve/stub-resolv.conf dest={{ chroot_path }}/etc/resolv.conf state=link force=yes follow=no owner=root group=root