diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-18 04:45:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 04:45:18 -0500 |
| commit | e748591d96c64560c94f141a178b9f719a28721a (patch) | |
| tree | eba8734ae13a593b543fd26dbf4a6f55ffa88431 /roles | |
| parent | f186712088f8e14d7f90a010d0f2cb250e24ee42 (diff) | |
| parent | 7f805f9a0c41477365dd88b0ac73f0d221bd654a (diff) | |
| download | openshift-e748591d96c64560c94f141a178b9f719a28721a.tar.gz openshift-e748591d96c64560c94f141a178b9f719a28721a.tar.bz2 openshift-e748591d96c64560c94f141a178b9f719a28721a.tar.xz openshift-e748591d96c64560c94f141a178b9f719a28721a.zip | |
Merge pull request #4213 from giuseppe/change-requires-to-wants-openvswitch
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.service | 2 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/templates/openshift.docker.node.service | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service index 06782cb8b..d89b64b06 100644 --- a/roles/openshift_node/templates/openshift.docker.node.service +++ b/roles/openshift_node/templates/openshift.docker.node.service @@ -5,7 +5,7 @@ After=openvswitch.service PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift.common.use_openshift_sdn %} -Requires=openvswitch.service +Wants=openvswitch.service After=ovsdb-server.service After=ovs-vswitchd.service {% endif %} diff --git a/roles/openshift_node_upgrade/templates/openshift.docker.node.service b/roles/openshift_node_upgrade/templates/openshift.docker.node.service index a9b393652..2a099301a 100644 --- a/roles/openshift_node_upgrade/templates/openshift.docker.node.service +++ b/roles/openshift_node_upgrade/templates/openshift.docker.node.service @@ -5,7 +5,7 @@ After=openvswitch.service PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift.common.use_openshift_sdn %} -Requires=openvswitch.service +Wants=openvswitch.service {% endif %} Wants={{ openshift.common.service_type }}-master.service Requires={{ openshift.common.service_type }}-node-dep.service |