diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-06 02:47:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 02:47:01 -0700 |
| commit | 7db933d9b03d7d780e3c2e6ae688477e2e8d43f1 (patch) | |
| tree | de477e6a63a5daa9d5af878d04e3d6308bd13ec1 | |
| parent | e4eba2b6f09a98625a00a857f59fe794fe4be6c3 (diff) | |
| parent | 0164d95a2457dccc61163fde984abf7c80456624 (diff) | |
| download | openshift-7db933d9b03d7d780e3c2e6ae688477e2e8d43f1.tar.gz openshift-7db933d9b03d7d780e3c2e6ae688477e2e8d43f1.tar.bz2 openshift-7db933d9b03d7d780e3c2e6ae688477e2e8d43f1.tar.xz openshift-7db933d9b03d7d780e3c2e6ae688477e2e8d43f1.zip | |
Merge pull request #4820 from dcbw/revert-change-requires-to-wants-openvswitch
Automatic merge from submit-queue.
node: make node service PartOf=openvswitch.service when openshift-sdn is used
This reverts commit 7f805f9a0c41477365dd88b0ac73f0d221bd654a.
The commit causes the behavior seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1453113 because openshift-node
is no longer restarted when openvswitch is.
@giuseppe @sdodson @knobunc
RE https://github.com/openshift/openshift-ansible/pull/4213 can we get a more detailed explanation of why the various dependencies are not being restarted correctly?
| -rw-r--r-- | roles/openshift_node/templates/openshift.docker.node.service | 1 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/templates/openshift.docker.node.service | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service index 310d8b29d..561aa01f4 100644 --- a/roles/openshift_node/templates/openshift.docker.node.service +++ b/roles/openshift_node/templates/openshift.docker.node.service @@ -6,6 +6,7 @@ PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift_node_use_openshift_sdn %} Wants=openvswitch.service +PartOf=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 864e4b5d6..07d1ebc3c 100644 --- a/roles/openshift_node_upgrade/templates/openshift.docker.node.service +++ b/roles/openshift_node_upgrade/templates/openshift.docker.node.service @@ -6,6 +6,7 @@ PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift_use_openshift_sdn %} Wants=openvswitch.service +PartOf=openvswitch.service After=ovsdb-server.service After=ovs-vswitchd.service {% endif %} |