From 7a9fd23801a1c5251fbb0f10624867a338920e1f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 12 May 2019 21:04:31 +0200
Subject: [PATCH] Fix ansible-lint

The current tests never fail, change ansible-lint invocation so that it
fails - and fix problems.

Change-Id: I6aeb1e3a4c28af71a858ec83c21f4dbb5e7ef97f
---
 meta/main.yml     |  2 +-
 tasks/config.yaml |  2 +-
 tasks/main.yaml   | 10 +++++-----
 tox.ini           |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index cf79def..c7c15f8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -105,7 +105,7 @@ galaxy_info:
   # Below are all categories currently available. Just as with
   # the platforms above, uncomment those that apply to your role.
   #
-  categories:
+  galaxy_tags:
   #- cloud
   #- cloud:ec2
   #- cloud:gce
diff --git a/tasks/config.yaml b/tasks/config.yaml
index c5f9cba..488a1ff 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -11,7 +11,7 @@
     puppet_environmentpath: '$confdir/environments'
   when:
     - puppet_version == '3'
-    - puppet_environmentpath == ''
+    - not puppet_environmentpath
 
 # Create our config
 - name: Create puppet.conf from template
diff --git a/tasks/main.yaml b/tasks/main.yaml
index cb00cd6..340d7d0 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -18,7 +18,7 @@
 
     - name: Set management server hieradata var
       set_fact:
-        mgmt_hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
+        mgmt_hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if mgmt_puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" # noqa 204
 
   when: mgmt_hieradata is not defined
 
@@ -42,7 +42,7 @@
 
     - name: Set hieradata var
       set_fact:
-        hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}"
+        hieradata: "{{ '/etc/puppet/hieradata/' + puppet_environment if puppet_version == '3' else '/etc/puppetlabs/code/environments/' + puppet_environment + '/hieradata' }}" # noqa 204
 
     - name: ensure hiera directory
       file:
@@ -95,7 +95,7 @@
     - name: Set management server puppet module dir to user-defined path
       set_fact:
         mgmt_puppet_module_dir: "{{ puppet_basemodulepath }}"
-      when: puppet_basemodulepath != ''
+      when: puppet_basemodulepath
 
     - name: Set management server puppet module dir
       set_fact:
@@ -106,7 +106,7 @@
     - name: Set puppet module dir to user-defined path
       set_fact:
         puppet_module_dir: "{{ puppet_basemodulepath }}"
-      when: puppet_basemodulepath != ''
+      when: puppet_basemodulepath
 
     - name: Set puppet module dir
       set_fact:
@@ -147,7 +147,7 @@
         - name: find logs
           shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"
           register: files
-          failed_when: files.stdout_lines|default("") == ""
+          failed_when: not files.stdout_lines|default("")
 
         - name: set log filename
           set_fact: puppet_logfile="{{ files.stdout_lines|sort|last }}"
diff --git a/tox.ini b/tox.ini
index c6ab94c..f93b3e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ commands =
 [testenv:linters]
 whitelist_externals = bash
 commands =
-    {[testenv:ansible-lint]commands}
+   ansible-lint {toxinidir}
 
 [testenv:venv]
 commands = {posargs}