Merge "OpenShift: Properly disable bare metal OVS"

2018-02-08 15:49:50 +00:00 · 2018-02-08 15:49:50 +00:00 · 5e72697d48
parent 49d8f4ea76 5ebcd23f0d
commit 5e72697d48
1 changed files with 7 additions and 1 deletions
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@ -125,10 +125,16 @@ outputs:
                  # into openshift-ansible but it's not been released yet.
                  # This code will go away as soon as an rpm with the required
                  # roles hits the repo.
-                  - name: Install NetworkManager
+                  - name: OpenShift networking preparation
                    hosts: all

                    tasks:
+                      - name: Stop and disable OVS on bare metal
+                        service:
+                          name: openvswitch
+                          state: stopped
+                          enabled: no
+
                      - name: install NetworkManager
                        package:
                          name: NetworkManager