From fd740a409e45995f533200659e4d845bab919259 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Mon, 26 Feb 2018 12:16:58 +0100
Subject: [PATCH] Don't stop openvswitch when deploying OpenShift

Instead of disabling openvswitch managed by TripleO when deploying
OpenShift, we should tell OpenShift to let TripleO manage it. We're
going down this path on the openshift-ansible path so we'll stop
disabling openvswitch in t-h-t.

Change-Id: I51226fc363f1c15deb6e33cc7ce15ffe3ac7e9c7
---
 extraconfig/services/openshift-master.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 9e9a29c340..242699a13d 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -121,6 +121,7 @@ outputs:
                   containerized: true
                   openshift_master_cluster_method: native
                   openshift_use_dnsmasq: true
+                  openshift_use_external_openvswitch: true
 
             - name: set openshift global vars fact
               set_fact:
@@ -147,12 +148,6 @@ outputs:
                     hosts: all
 
                     tasks:
-                      - name: Stop and disable OVS on bare metal
-                        service:
-                          name: openvswitch
-                          state: stopped
-                          enabled: no
-
                       - name: install NetworkManager
                         package:
                           name: NetworkManager