Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael DAmato authored and Michael DAmato committed Nov 4, 2022
1 parent 42d3fd9 commit 216b488
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 16 deletions.
1 change: 1 addition & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ ignore: |
.github/
inventory/sample/group_vars/rke2_servers.yml
inventory/sample/group_vars/rke2_agents.yml
inventory/test-inventory*
12 changes: 6 additions & 6 deletions roles/rke2_common/tasks/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
register: updated_rke2_config
changed_when: false

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand All @@ -117,7 +117,7 @@
register: updated_rke2_config
changed_when: false

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand All @@ -133,7 +133,7 @@
register: updated_rke2_config
changed_when: false

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand All @@ -150,7 +150,7 @@
register: updated_rke2_config
changed_when: false

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand All @@ -166,7 +166,7 @@
register: updated_rke2_config
changed_when: false

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand All @@ -181,7 +181,7 @@
when: (cloud_provider_name is defined) and (cloud_provider_name|length > 0)
register: updated_rke2_config

- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
set_fact:
rke2_config: "{{ updated_rke2_config.rke2_config }}"
when: updated_rke2_config.changed
Expand Down
4 changes: 3 additions & 1 deletion roles/rke2_common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
name: firewalld
state: stopped
enabled: no
when: ansible_facts.services["firewalld.service"] is defined and ansible_facts.services["firewalld.service"].status != "not-found"
when:
- ansible_facts.services["firewalld.service"] is defined
- ansible_facts.services["firewalld.service"].status != "not-found"

- include: network_manager_fix.yaml

Expand Down
7 changes: 4 additions & 3 deletions roles/rke2_common/tasks/rpm_install.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Calculate rke2_full_version
when: ( install_rke2_version is not defined ) or ( install_rke2_version | length == 0 )

- name: "Calculate rke2 full version "
when: ( install_rke2_version is not defined ) or ( install_rke2_version | length == 0 ) # noqa var-spacing
block:
- name: Stop if the provided is not valid
fail:
Expand All @@ -20,7 +21,7 @@
args:
executable: /usr/bin/bash

- name: Set rke2_full_version fact
- name: Set rke2_full_version fact # noqa var-spacing
set_fact:
rke2_full_version: "{{ rke2_full_version.stdout if ((install_rke2_version is not defined) or (install_rke2_version|length == 0)) else install_rke2_version }}" # yamllint disable-line rule:line-length

Expand Down
2 changes: 1 addition & 1 deletion roles/rke2_common/tasks/tarball_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
mode: '0644'
when: rke2_binary_tarball_check.stat.exists

- name: Download tarball
- name: Download tarball # noqa var-spacing
when: not rke2_binary_tarball_check.stat.exists
block:
- name: Stop if the provided channel is not valid
Expand Down
4 changes: 2 additions & 2 deletions roles/rke2_server/tasks/first_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- name: Wait for k8s apiserver
wait_for:
host: "{{ kubernetes_api_server_host }}"
host: localhost
port: "6443"
state: present
timeout: 300
Expand All @@ -30,7 +30,7 @@
delay: 10
changed_when: false

- name: Extract the hostname-override parameter from the kubelet process
- name: Extract the hostname-override parameter from the kubelet process # noqa var-spacing
set_fact:
kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\
Expand Down
4 changes: 2 additions & 2 deletions roles/rke2_server/tasks/other_servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
when:
- '"server:" not in server_url_check.stdout'

- name: Start and wait for healthy node
- name: Start and wait for healthy node # noqa var-spacing
throttle: 1
block:
- name: Start rke2-server
Expand All @@ -55,7 +55,7 @@
delay: 10
changed_when: false

- name: Extract the hostname-override parameter from the kubelet process
- name: Extract the hostname-override parameter from the kubelet process # noqa var-spacing
set_fact:
kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\
Expand Down
2 changes: 1 addition & 1 deletion roles/testing/tasks/kubectl_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
delay: 10
changed_when: false

- name: Extract the hostname-override parameter from the kubelet process
- name: Extract the hostname-override parameter from the kubelet process # noqa var-spacing
set_fact:
kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\
Expand Down

0 comments on commit 216b488

Please sign in to comment.