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

Lint the whole collection and introduce a common style #223

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Adds linter exception where needed
mocdaniel committed Nov 23, 2023
commit 100aa242731939166e46d26fdfc62888221dfe7a
10 changes: 5 additions & 5 deletions roles/icingaweb2/tasks/manage_icingaweb_config.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
group: "{{ icingaweb2_group }}"
mode: "2770"

- name: Ensure fragments exists
- name: Ensure fragments exists # noqa: risky-file-permissions
ansible.builtin.file:
state: directory
dest: "{{ icingaweb2_fragments_path }}/{{ item }}"
@@ -69,7 +69,7 @@
- name: Assemble resources.ini
when: icingaweb2_db is defined or icingaweb2_resources is defined
block:
- name: Manage icingaweb_db resource config
- name: Manage icingaweb_db resource config # noqa: risky-file-permissions
ansible.builtin.template:
src: modules_config.ini.j2
dest: "{{ icingaweb2_fragments_path }}/resources/resources_01"
@@ -82,7 +82,7 @@
_i2_config_hash: "{{ icingaweb2_resources }}"
when: icingaweb2_resources is defined

- name: Manage Resources
- name: Manage Resources # noqa: risky-file-permissions
ansible.builtin.template:
src: modules_config.ini.j2
dest: "{{ icingaweb2_fragments_path }}/resources/resources_02"
@@ -102,7 +102,7 @@
permissions:
- "*"

- name: Manage icingaweb2_admin privileges
- name: Manage icingaweb2_admin privileges # noqa: risky-file-permissions
ansible.builtin.template:
src: modules_config.ini.j2
dest: "{{ icingaweb2_fragments_path }}/roles/roles_01"
@@ -115,7 +115,7 @@
_i2_config_hash: "{{ icingaweb2_roles }}"
when: icingaweb2_roles is defined

- name: Manage icingaweb2_admin privileges
- name: Manage icingaweb2_admin privileges # noqa: risky-file-permissions
ansible.builtin.template:
src: modules_config.ini.j2
dest: "{{ icingaweb2_fragments_path }}/roles/roles_02"
8 changes: 4 additions & 4 deletions roles/icingaweb2/tasks/modules/director.yml
Original file line number Diff line number Diff line change
@@ -19,28 +19,28 @@
- config

- name: Module Director | Check for pending migrations
ansible.builtin.shell:
ansible.builtin.shell: # noqa: command-instead-of-shell
cmd: icingacli director migration pending
register: _pending
changed_when: _pending.rc|int == 0
failed_when: _pending.stdout|length > 0
when: vars['icingaweb2_modules']['director']['import_schema'] is defined and vars['icingaweb2_modules']['director']['import_schema'] and vars['icingaweb2_modules']['director']['config'] is defined

- name: Module Director | Apply pending migrations
ansible.builtin.shell:
ansible.builtin.shell: # noqa: command-instead-of-shell
cmd: icingacli director migration run
when: vars['icingaweb2_modules']['director']['import_schema'] is defined and vars['icingaweb2_modules']['director']['import_schema'] and vars['icingaweb2_modules']['director']['config'] is defined and _pending.rc|int == 0

- name: Module Director | Check if kickstart is required
ansible.builtin.shell:
ansible.builtin.shell: # noqa: command-instead-of-shell
cmd: icingacli director kickstart required
register: _required
changed_when: _required.rc|int == 0
failed_when: _required.rc|int >= 2
when: vars['icingaweb2_modules']['director']['run_kickstart'] is defined and vars['icingaweb2_modules']['director']['run_kickstart'] and vars['icingaweb2_modules']['director']['kickstart'] is defined

- name: Module Director | Check if kickstart is required
ansible.builtin.shell:
ansible.builtin.shell: # noqa: command-instead-of-shell
cmd: icingacli director kickstart run
when: vars['icingaweb2_modules']['director']['run_kickstart'] is defined and vars['icingaweb2_modules']['director']['run_kickstart'] and vars['icingaweb2_modules']['director']['kickstart'] is defined and _required.rc|int == 0

4 changes: 2 additions & 2 deletions roles/icingaweb2/tasks/modules/manage_module_config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- name: Module {{ _module }} | Set file content as hash
- name: Module {{ _module }} | Set file content as hash # noqa: name[template]
ansible.builtin.set_fact:
_i2_config_hash: "{{ lookup('list', vars['icingaweb2_modules'][_module][_file]) }}"

- name: Module {{ _module }} | Write config file {{ _file }}.ini
- name: Module {{ _module }} | Write config file {{ _file }}.ini # noqa: name[template]
ansible.builtin.template:
src: "modules_config.ini.j2"
dest: "{{ icingaweb2_modules_config_dir }}/{{ _module }}/{{ _file }}.ini"