Merge pull request #54 from haydenseitz/update-ansible-lint-syntax

update CI testing

.git_hooks/pre-commit

@@ -8,7 +8,7 @@ set -x
 
 # Pre-commit hooks to copy steps from default CI/CD pipeline. See `bitbucket-pipelines.yml` for details.
 [ $(command -v shellcheck) ] && find . -path ./tmp -prune -false -o -name "*.sh" -print -exec shellcheck -x {} \;
-[ $(command -v ansible-lint) ] && ansible-lint --nocolor -p --parseable-severity
+[ $(command -v ansible-lint) ] && ansible-lint --nocolor -p
 [ $(command -v yamllint) ] && yamllint -s  .
 [ $(command -v flake8) ] && flake8
 

.gitignore

@@ -0,0 +1 @@
+__pycache__

handlers/main.yml

@@ -1,13 +1,13 @@
 ---
 # file: roles/haproxy/handlers/main.yml
 - name: restart haproxy
-  service:
+  ansible.builtin.service:
     name: "{{ haproxy_service }}"
     state: restarted
   when: haproxy_mode == "system"
 
 - name: reload haproxy
-  service:
+  ansible.builtin.service:
     name: "{{ haproxy_service }}"
     state: reloaded
   when: haproxy_mode == "system"

molecule/default/molecule.yml

@@ -7,7 +7,7 @@ driver:
 lint: |
   set -ex
   yamllint -s .
-  ansible-lint --nocolor -p --parseable-severity --exclude=molecule/ --exclude=tests/
+  ansible-lint --nocolor -p --exclude=molecule/ --exclude=tests/
   flake8
 platforms:
   # https://wiki.debian.org/DebianReleases
@@ -26,12 +26,18 @@ platforms:
     command: sleep infinity
     groups: [Debian]
     privileged: true
-  # https://www.centos.org/centos-linux/
-  - name: centos8
-    image: centos:8
+  # https://rockylinux.org/
+  - name: rockylinux8
+    image: rockylinux:8
     command: /sbin/init
     groups: [RedHat]
     privileged: true
+  # https://www.centos.org/centos-linux/
+  # - name: centos8
+  #   image: centos:8
+  #   command: /sbin/init
+  #   groups: [ RedHat ]
+  #   privileged: true
   - name: centos7
     image: centos:7
     command: /sbin/init

tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 # file: roles/haproxy/tasks/config.yml
 - name: Configuring HAproxy
-  template:
+  ansible.builtin.template:
     src: etc/haproxy/haproxy.cfg.j2
     dest: "{{ haproxy_config }}"
     mode: "0640"

tasks/install-Debian.yml

@@ -1,20 +1,20 @@
 ---
 # file: roles/haproxy/tasks/install-Debian.yml
 - name: Set haproxy release
-  set_fact:
+  ansible.builtin.set_fact:
     haproxy_release: "{{ ansible_distribution_release }}-backports"
   when: haproxy_apt_backports | bool
 
 - name: "Installing HAproxy from {{ haproxy_release | default(ansible_distribution_release) }}"
-  apt:
+  ansible.builtin.apt:
     name: "{{ haproxy_package }}"
     state: present
     update_cache: true
     cache_valid_time: 3600
     default_release: "{{ haproxy_release | default(ansible_distribution_release) }}"
 
 - name: "Installing selinux python bindings"
-  apt:
+  ansible.builtin.apt:
     name: "{{ haproxy_selinux_packages }}"
     state: present
   when: haproxy_selinux | bool

tasks/install-Generic.yml

@@ -1,7 +1,7 @@
 ---
 # file: roles/haproxy/tasks/install-Generic.yml
 - name: "RedHat | Install basic repo file"
-  yum_repository:
+  ansible.builtin.yum_repository:
     name: "{{ item.name }}"
     description: "{{ item.description  | default(omit) }}"
     baseurl: "{{ item.baseurl }}"
@@ -18,11 +18,11 @@
   when: haproxy_repo_yum is defined
 
 - name: Installing HAproxy package
-  package:
+  ansible.builtin.package:
     name: "{{ haproxy_package }}"
 
 - name: "Installing selinux python bindings"
-  package:
+  ansible.builtin.package:
     name: "{{ haproxy_selinux_packages }}"
     state: present
   when: haproxy_selinux | bool

tasks/install.yml

@@ -6,7 +6,7 @@
   when: ansible_os_family != 'Debian'
 
 - name: Enabling and starting HAproxy service
-  service:
+  ansible.builtin.service:
     name: "{{ haproxy_service }}"
     state: started
     enabled: true

tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 # file: roles/haproxy/tasks/main.yml
 - name: Include OS variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
   tags:
     - haproxy
     - haproxy-install