From 745913a3c2deaa1f702ea6f20397514438c5a4c9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 11 Aug 2018 07:03:12 -0500
Subject: [PATCH] Allow setting puppet_version explicitly

If we set puppet_version as an inventory variable, then we can drive
behavior from that variable, including updating puppet. Add the ability
to set it here. A followup change in system-config will start setting
it, but starting off it should be a no-op.

Change-Id: I773ba3a2137b62ae2b3440dd02b3cdfb2099a62d
---
 tasks/main.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tasks/main.yaml b/tasks/main.yaml
index a41195e..779dafa 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -25,11 +25,14 @@
 - name: Get puppet version
   shell:
     cmd: "PATH=$PATH:/opt/puppetlabs/bin puppet --version | cut -d '.' -f 1"
-  register: puppet_version
+  register: puppet_version_output
+  when: puppet_version is not defined
 
 - name: Set puppet version fact
   set_fact:
-    puppet_version: "{{ puppet_version.stdout }}"
+    puppet_version: "{{ puppet_version_output.stdout }}"
+  when:
+    - puppet_version is not defined
 
 - name: Sanity check puppet version
   fail: "Unsupported puppet version {{ puppet_version }}"