From 1a0241e889e94567b5d33d89d3210876f0c34c88 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 28 Aug 2017 19:33:01 -0400
Subject: Fix openshift_master upgrade

Currently, openshift_master upgrade play imports tasks directly
from the openshift_master role.  This method does not honor
role defaults.

This commit changes sets openshift_master_config_dir if undefined.
---
 .../common/openshift-cluster/upgrades/upgrade_control_plane.yml      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index abcd21c90..fbb355703 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -91,10 +91,7 @@
 
   - include_vars: ../../../../roles/openshift_master/vars/main.yml
 
-  - name: Remove any legacy systemd units
-    include: ../../../../roles/openshift_master/tasks/clean_systemd_units.yml
-
-  - name: Update systemd units
+  - name: Remove any legacy systemd units and update systemd units
     include: ../../../../roles/openshift_master/tasks/systemd_units.yml
 
   - name: Check for ca-bundle.crt
-- 
cgit v1.2.3