From dfe4f2ddb0925e0174070c76b92183239b40d259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Mon, 14 Jan 2019 11:30:02 +0100
Subject: [PATCH] Remove gluster settings from previous deployments on
 re-deploy

The openshift/global_gluster_vars.yml file was not removed on re-deploy
and caused issue when reploying openshift without CNS after deploying
openshift a first time with CNS.

Change-Id: I0eedca7d53f7d3801f163ab9dd901bfb8651dd2c
Closes-Bug: #1811664
---
 extraconfig/services/openshift-master.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 4ae8aaa102..8826429405 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -142,6 +142,10 @@ outputs:
                   file:
                     path: "{{playbook_dir}}/openshift/inventory"
                     state: absent
+                - name: remove global_gluster_vars
+                  file:
+                    path: "{{playbook_dir}}/openshift/global_gluster_vars.yml"
+                    state: absent
                 - name: create openshift inventory directory
                   file:
                     path: "{{playbook_dir}}/openshift/inventory"