From 642add61b3825cf992ff5e5b65bc145414778d78 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 7 Mar 2016 21:38:36 -0800
Subject: [PATCH] Always puppetboard upload if puppetboard defined

We should always upload to puppetboard (even when puppet fails) if the
puppetboard server is defined. This allows puppetboard to learn of both
successful and failed puppet runs.

Change-Id: I62a78200052443997baf549256c78b38bd37f63e
---
 tasks/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index b0ca387..586dfd4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -54,16 +54,16 @@
   when: manage_config|bool
   include: config.yml
 
-- name: run puppet
-  puppet:
-    puppetmaster: "{{ puppetmaster|default(omit) }}"
-    manifest: "{{ manifest|default(omit) }}"
-    show_diff: "{{ show_diff|default(false) }}"
-    facts: "{{ facts|default(omit) }}"
-    facter_basename: "{{ facter_basename|default(omit) }}"
-    logdest: "{{ puppet_logdest|default(omit) }}"
-
 - block:
+  - name: run puppet
+    puppet:
+      puppetmaster: "{{ puppetmaster|default(omit) }}"
+      manifest: "{{ manifest|default(omit) }}"
+      show_diff: "{{ show_diff|default(false) }}"
+      facts: "{{ facts|default(omit) }}"
+      facter_basename: "{{ facter_basename|default(omit) }}"
+      logdest: "{{ puppet_logdest|default(omit) }}"
+- always:
   - name: find logs
     shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"
     register: files