Tied debug logging to verbosity, fix galaxy lint issues

wcm-io-devops · Dec 17, 2018 · 86898d0 · 86898d0
1 parent 4f77677
commit 86898d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -20,31 +20,27 @@ Available variables are listed below, along with their default values:
 
     jenkins_facts_admin_username: admin
 
-Jenkins admin username
+Jenkins admin username.
 
     jenkins_facts_admin_password: admin
 
-Jenkins admin password
+Jenkins admin password.
 
     jenkins_facts_jenkins_hostname: localhost
 
-Hostname of the jenkins instance
+Hostname of the jenkins instance.
 
     jenkins_facts_jenkins_port: 8080
 
-HTTP port of the jenkins instance
+HTTP port of the jenkins instance.
 
     jenkins_facts_jenkins_url_prefix: ""
 
-Url prefix of the jenkins instance, e.g. when running in tomcat
+Url prefix of the jenkins instance, e.g. when running in tomcat.
 
     jenkins_facts_jenkins_base_url: "http://{{ jenkins_facts_jenkins_hostname }}:{{ jenkins_facts_jenkins_port }}{{ jenkins_facts_jenkins_url_prefix }}"
 
-The base url of the jenkins instance
-
-    jenkins_facts_debug: false
-
-When set to enable the role will log some debug information
+The base url of the jenkins instance.
 
 ## Dependencies
 
@@ -76,7 +72,7 @@ This playbook gathers facts from a jenkins instance and outputs them:
 
     - hosts: jenkins
       roles:
-        - { role: wcm_io_devops.jenkins_facts, jenkins_facts_debug: true }
+        - { role: wcm_io_devops.jenkins_facts }
 
 ## License
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -15,6 +15,3 @@ jenkins_facts_jenkins_url_prefix: ""
 
 # The base url of the jenkins instance
 jenkins_facts_jenkins_base_url: "http://{{ jenkins_facts_jenkins_hostname }}:{{ jenkins_facts_jenkins_port }}{{ jenkins_facts_jenkins_url_prefix }}"
-
-# When set to enable the role will log some debug information
-jenkins_facts_debug: false
diff --git a/tasks/gather_jenkins_facts.yml b/tasks/gather_jenkins_facts.yml
@@ -32,7 +32,7 @@
     set_fact:
       jenkins_facts_csrf_crumb: "{{ _jenkins_facts_csrf_crumb_result.content | regex_replace('^Jenkins-Crumb:([0-9a-zA-Z]+)$', '\\1') }}"
 
-  when: jenkins_facts_csrf_enabled == true
+  when: jenkins_facts_csrf_enabled
 
 - name: "gather_jenkins_facts : debug."
   debug:
@@ -51,5 +51,4 @@
       - "{{ jenkins_facts_plugins_failed }}"
       - jenkins_facts_csrf_crumb
       - "{{ jenkins_facts_csrf_crumb }}"
-
-  when: jenkins_facts_debug == true
+    verbosity: 1