galaxy lint, dependency naming

.kitchen.vagrant.yml

@@ -27,4 +27,3 @@ suites:
   - name: default
     run_list:
     attributes:
-

.kitchen.yml

@@ -35,4 +35,3 @@ suites:
   - name: default
     run_list:
     attributes:
-

.travis.yml

@@ -78,4 +78,3 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-

.travis.yml.docker

@@ -77,4 +77,3 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-

.travis.yml.lxd

@@ -91,4 +91,3 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-

.travis.yml.lxd-kitchen

@@ -72,4 +72,3 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-

.travis.yml.simple

@@ -34,4 +34,3 @@ script:
 # Serverspec
 #  - "test/integration/default/serverspec/run-local-tests.sh"
   - "cd test/integration/default/serverspec/ && bundle exec rake spec"
-

defaults/main.yml

@@ -6,4 +6,3 @@ fprobe_flow_collector: '127.0.0.1:9995'
 ## downgrade user and chroot to dir
 #fprobe_args: '-fip -u nobody -c /var/empty'  ## not working with user nobody or non-existing chrooted dir
 fprobe_args: '-fip -c /var/tmp'
-

get-dependencies.sh

@@ -9,11 +9,10 @@ else
 rolesdir=$(dirname $0)/..
 fi
 
-[ ! -d $rolesdir/juju4.redhat-epel ] && git clone https://github.com/juju4/ansible-redhat-epel $rolesdir/juju4.redhat-epel
+[ ! -d $rolesdir/juju4.redhat_epel ] && git clone https://github.com/juju4/ansible-redhat-epel $rolesdir/juju4.redhat_epel
 ## galaxy naming: kitchen fails to transfer symlink folder
 #[ ! -e $rolesdir/juju4.fprobe ] && ln -s ansible-fprobe $rolesdir/juju4.fprobe
 [ ! -e $rolesdir/juju4.fprobe ] && cp -R $rolesdir/ansible-fprobe $rolesdir/juju4.fprobe
 
 ## don't stop build on this script return code
 true
-

handlers/main.yml

@@ -3,4 +3,3 @@
 - name: restart fprobe
   service: name={{ fprobe_svc }} state=restarted sleep=5
   ignore_errors: true
-

meta/main.yml

@@ -4,11 +4,6 @@ galaxy_info:
   description: setup fprobe as netflow exporter
   license: BSD
   min_ansible_version: 2.0
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
   platforms:
   - name: EL
     versions:
@@ -20,14 +15,9 @@ galaxy_info:
     - trusty
     - xenial
     - bionic
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
   galaxy_tags:
   - system
   - security
 #dependencies: []
 dependencies:
-  - juju4.redhat-epel
+  - juju4.redhat_epel
-

tasks/fprobe.yml

@@ -1,8 +1,9 @@
 ---
 
 - name: install fprobe from packages
-  package: name={{ item }} state=present
+  package: name={{ fprobe_pkg }} state=present
-  with_items: "{{ fprobe_pkg }}"
+  register: pkg_result
+  until: pkg_result is success
 
 - name: Debian | update fprobe config
   replace: "dest=/etc/default/fprobe regexp={{ item.re }} replace={{ item.rep }} backup=yes"
@@ -28,7 +29,9 @@
 #      changed_when: false
 #    - name: RedHat | start fprobe manually
 #      command: "fprobe-ulog -c /var/tmp {{ fprobe_flow_collector }}"
-#  when: ansible_os_family == 'RedHat' and ps is defined and ps.stdout is defined and ps.stdout.find(" fprobe-ulog ") == -1
+#  when: >
+#    ansible_os_family == 'RedHat' and ps is defined and ps.stdout is defined and
+#    ps.stdout.find(" fprobe-ulog ") == -1
 
 - block:
     - name: install fprobe systemd configuration

tasks/immutable.yml

@@ -26,5 +26,3 @@
 #    attributes: '----i-----I--e--'
   when: state == 'post'
   ignore_errors: true
-
-

tasks/main.yml

@@ -8,13 +8,12 @@
   when: ansible_distribution == 'Ubuntu'
 - name: Include version-specific variables for RedHat
   include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml"
-  when: ansible_os_family == "RedHat" or ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+  when: ansible_os_family == "RedHat"
 
 #- include: debian.yml
 #  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
 #- include: redhat.yml
-#  when: ansible_os_family == "RedHat" or ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+#  when: ansible_os_family == "RedHat"
 
 - include: fprobe.yml
-

test/vagrant/site.yml

@@ -3,4 +3,3 @@
 - hosts: all
   roles:
     - juju4.fprobe
-

vars/RedHat-6.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe-ulog
 
 fprobe_svc: fprobe-ulog
-

vars/RedHat-7.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe-ulog
 
 fprobe_svc: fprobe-ulog
-

vars/Ubuntu-12.04.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe
 
 fprobe_svc: fprobe
-

vars/Ubuntu-14.04.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe
 
 fprobe_svc: fprobe
-

vars/Ubuntu-16.04.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe
 
 fprobe_svc: fprobe
-

vars/Ubuntu-18.04.yml

@@ -4,4 +4,3 @@ fprobe_pkg:
   - fprobe
 
 fprobe_svc: fprobe
-