Skip to content

Commit

Permalink
Fix linting findings.
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-checkmk committed Jan 11, 2023
1 parent e3a6b05 commit 057a4c6
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
14 changes: 7 additions & 7 deletions roles/server/molecule/2.0.0/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
gather_facts: false
tasks:

- name: "Test Server is running."
ansible.builtin.uri:
url: "{{ server_url }}/{{ checkmk_site }}/"
register: checkmk_server_url_state
- name: "Test Server is running."
ansible.builtin.uri:
url: "{{ server_url }}/{{ checkmk_site }}/"
register: checkmk_server_url_state

- name: "Verify Server is running."
ansible.builtin.assert:
that: checkmk_server_url_state.status == 200
- name: "Verify Server is running."
ansible.builtin.assert:
that: checkmk_server_url_state.status == 200
14 changes: 7 additions & 7 deletions roles/server/molecule/2.1.0/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
gather_facts: false
tasks:

- name: "Test Server is running."
ansible.builtin.uri:
url: "{{ server_url }}/{{ checkmk_site }}/"
register: checkmk_server_url_state
- name: "Test Server is running."
ansible.builtin.uri:
url: "{{ server_url }}/{{ checkmk_site }}/"
register: checkmk_server_url_state

- name: "Verify Server is running."
ansible.builtin.assert:
that: checkmk_server_url_state.status == 200
- name: "Verify Server is running."
ansible.builtin.assert:
that: checkmk_server_url_state.status == 200
52 changes: 26 additions & 26 deletions roles/server/tasks/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
- name: "Enable repositories on CentOS & RHEL 8."
block:

- name: "Download EPEL GPG Key on CentOS & RHEL 8."
ansible.builtin.get_url:
url: "{{ checkmk_server_epel_gpg_key }}"
dest: "/tmp/EPEL-pubkey.gpg"
mode: "0640"
when: checkmk_server_verify_setup | bool
tags:
- download-gpg-key
- enable-repos
- name: "Download EPEL GPG Key on CentOS & RHEL 8."
ansible.builtin.get_url:
url: "{{ checkmk_server_epel_gpg_key }}"
dest: "/tmp/EPEL-pubkey.gpg"
mode: "0640"
when: checkmk_server_verify_setup | bool
tags:
- download-gpg-key
- enable-repos

- name: "Import Checkmk GPG Key on RHEL 8."
become: true
ansible.builtin.rpm_key:
key: "/tmp/EPEL-pubkey.gpg"
state: present
when: checkmk_server_epel_gpg_check | bool
tags:
- import-gpg-key
- enable-repos
- name: "Import Checkmk GPG Key on RHEL 8."
become: true
ansible.builtin.rpm_key:
key: "/tmp/EPEL-pubkey.gpg"
state: present
when: checkmk_server_epel_gpg_check | bool
tags:
- import-gpg-key
- enable-repos

- name: "Install epel-release from URL on CentOS & RHEL 8."
become: true
ansible.builtin.yum:
name: "{{ checkmk_server_epel_url }}"
state: present
disable_gpg_check: "{{ not checkmk_server_epel_gpg_check | bool }}"
tags:
- enable-repos
- name: "Install epel-release from URL on CentOS & RHEL 8."
become: true
ansible.builtin.yum:
name: "{{ checkmk_server_epel_url }}"
state: present
disable_gpg_check: "{{ not checkmk_server_epel_gpg_check | bool }}"
tags:
- enable-repos

when: |
(ansible_facts.distribution == "RedHat" or ansible_facts.distribution == "CentOS")
Expand Down

0 comments on commit 057a4c6

Please sign in to comment.