Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fully qualified collection names (FQCN) and fix linting for latest ansible-later version and drop Ubuntu 18.04 #11

Merged
merged 5 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4

- name: Role linting
uses: actionhippie/ansible-later@v2
uses: actionhippie/ansible-later@v3

testing:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .later.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ rules:
- molecule/ubuntu/tests
- README.md

yamllint:
document-end:
present: True

...
1 change: 0 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Standards: 1.2
---
# @var graylog_sidecar_package:description: Download URL for sidecar package
graylog_sidecar_package: https://github.com/Graylog2/collector-sidecar/releases/download/1.0.0/graylog-sidecar_1.0.0-1_amd64.deb
Expand Down
92 changes: 55 additions & 37 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Standards: 1.2
---
- name: Restart graylog-sidecar
systemd:
ansible.builtin.systemd:
name: graylog-sidecar
state: restarted
daemon_reload: True
Expand Down
2 changes: 0 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Standards: 1.2
---
# @meta author:value: [Thomas Boerger](https://github.com/tboerger)
# @meta description: >
Expand Down Expand Up @@ -28,7 +27,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- focal
- jammy
galaxy_tags:
Expand Down
1 change: 0 additions & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Standards: 1.2
---
- name: Converge
hosts: all
Expand Down
16 changes: 0 additions & 16 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Standards: 1.2
---
dependency:
name: galaxy
Expand Down Expand Up @@ -41,21 +40,6 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
environment:
container: docker
- name: graylog-sidecar-ubuntu-18
image: docker.io/geerlingguy/docker-ubuntu1804-ansible:latest
hostname: ubuntu
privileged: True
pre_build_image: True
override_command: False
cgroupns_mode: host
tmpfs:
- /tmp
- /run
- /run/lock
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
environment:
container: docker

provisioner:
name: ansible
Expand Down
42 changes: 36 additions & 6 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,51 @@
# Standards: 1.2
---
- name: Prepare
hosts: all
gather_facts: False

tasks:
- name: Stat apt dir
register: aptdir
ansible.builtin.stat:
path: /var/lib/apt

- name: Wait for aptlock
shell: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done
when: aptdir.stat.exists
changed_when: False
ansible.builtin.shell:
cmd: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done

- name: Update package cache
apt:
when: aptdir.stat.exists
ansible.builtin.apt:
update_cache: True

- name: Install gpg dependency
apt:
name: python3-gpg
- name: Install test dependencies
when: aptdir.stat.exists
loop:
- python3-gpg
- curl
ansible.builtin.apt:
name: "{{ item }}"
state: present

- name: Create man dirs
changed_when: False
loop:
- /usr/share/man/man1
- /usr/share/man/man2
- /usr/share/man/man3
- /usr/share/man/man4
- /usr/share/man/man5
- /usr/share/man/man6
- /usr/share/man/man7
- /usr/share/man/man8
- /usr/share/man/man9
ansible.builtin.file:
path: "{{ item }}"
owner: root
group: root
mode: u=rwx,g=rx,o=rx
state: directory

...
1 change: 0 additions & 1 deletion molecule/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Standards: 1.2
---
collections: []
roles: []
Expand Down
9 changes: 4 additions & 5 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Standards: 1.2
---
- name: Install required package
apt:
ansible.builtin.apt:
deb: "{{ graylog_sidecar_package }}"
state: present
tags:
Expand All @@ -10,7 +9,7 @@
- name: Write config file
notify:
- Restart graylog-sidecar
template:
ansible.builtin.template:
src: config.j2
dest: /etc/graylog/sidecar/sidecar.yml
owner: root
Expand All @@ -22,7 +21,7 @@
- name: Write service file
notify:
- Restart graylog-sidecar
template:
ansible.builtin.template:
src: service.j2
dest: /etc/systemd/system/graylog-sidecar.service
owner: root
Expand All @@ -32,7 +31,7 @@
- graylog-sidecar

- name: Start graylog-sidecar service
systemd:
ansible.builtin.systemd:
name: graylog-sidecar
state: started
daemon_reload: True
Expand Down