From afa4fd5799b0ff43d625d061e4c2bde66b5fb86a Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Thu, 9 Nov 2017 17:00:00 -0500
Subject: Combine openshift_node and openshift_node_upgrade

Currently, having openshift_node and openshift_node_upgrade
as two distinct roles has created a duplication across
handlers, templates, and some tasks.

This commit combines the roles to reduce duplication
and bugs encountered by not putting code in both places.
---
 roles/openshift_node/meta/main.yml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'roles/openshift_node/meta')

diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml
index 5bc7b9869..c32aa1600 100644
--- a/roles/openshift_node/meta/main.yml
+++ b/roles/openshift_node/meta/main.yml
@@ -13,9 +13,15 @@ galaxy_info:
   - cloud
 dependencies:
 - role: openshift_node_facts
+  when: not (openshift_node_upgrade_in_progress | default(False))
 - role: lib_openshift
 - role: lib_os_firewall
+  when: not (openshift_node_upgrade_in_progress | default(False))
 - role: openshift_clock
+  when: not (openshift_node_upgrade_in_progress | default(False))
 - role: openshift_docker
 - role: openshift_cloud_provider
+  when: not (openshift_node_upgrade_in_progress | default(False))
 - role: openshift_node_dnsmasq
+- role: lib_utils
+  when: openshift_node_upgrade_in_progress | default(False)
-- 
cgit v1.2.3