From 79d58eeb6e130e4bfa37f194632c29f9e4ad9156 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Mon, 16 May 2016 16:17:48 -0400
Subject: Fix 'recursive loop detected in template string' for upgrading
 variable.

---
 roles/openshift_docker/defaults/main.yml | 2 ++
 roles/openshift_docker/tasks/main.yml    | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 roles/openshift_docker/defaults/main.yml

(limited to 'roles/openshift_docker')

diff --git a/roles/openshift_docker/defaults/main.yml b/roles/openshift_docker/defaults/main.yml
new file mode 100644
index 000000000..aebef75d6
--- /dev/null
+++ b/roles/openshift_docker/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+upgrading: False
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml
index 5d5174ec9..9c5887f76 100644
--- a/roles/openshift_docker/tasks/main.yml
+++ b/roles/openshift_docker/tasks/main.yml
@@ -2,11 +2,6 @@
 # It's important that we don't explicitly pull this image here.  Otherwise we
 # could result in upgrading a preinstalled environment.  We'll have to set
 # openshift_image_tag correctly for upgrades.
-
-- set_fact:
-    upgrading: False
-  when: upgrading is not defined
-
 - set_fact:
     is_containerized: "{{ openshift.common.is_containerized | default(False) | bool }}"
     # Does the host already have an image tag fact, used to determine if it's a new node
-- 
cgit v1.2.3