openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't stop openvswitch when deploying OpenShift"

Browse Source
This commit is contained in:
Zuul
2018-03-19 07:48:54 +00:00
committed by Gerrit Code Review
parent c943adba5e fd740a409e
commit 2f2f22e76c
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extraconfig/services/openshift-master.yaml
View File

@@ -121,6 +121,7 @@ outputs:
containerized: true containerized: true
openshift_master_cluster_method: native openshift_master_cluster_method: native
openshift_use_dnsmasq: true openshift_use_dnsmasq: true
openshift_use_external_openvswitch: true
- name: set openshift global vars fact - name: set openshift global vars fact
set_fact: set_fact:
@@ -147,12 +148,6 @@ outputs:
hosts: all hosts: all
tasks: tasks:
- name: Stop and disable OVS on bare metal
service:
name: openvswitch
state: stopped
enabled: no
- name: install NetworkManager - name: install NetworkManager
package: package:
name: NetworkManager name: NetworkManager