Merge pull request #209 from linkernetworks/johnlin/ovs-systemd

[Bug] VX-236 start ovs after boot and before kubelet service
linkernetworks · Aug 1, 2018 · f35655f · f35655f
2 parents 4e2323e + 673aaa4
commit f35655f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/developers/systemctl/ovs-vswitchd.service b/developers/systemctl/ovs-vswitchd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Open vSwitch Forwarding Unit
 After=ovsdb-server.service network-pre.target systemd-udev-settle.service
-Before=network.target network.service
+Before=network.target network.service kubelet.service
 Requires=ovsdb-server.service
 ReloadPropagatedFrom=ovsdb-server.service
 AssertPathIsReadWrite=/var/run/openvswitch/db.sock
@@ -19,3 +19,7 @@ ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
           --ovs-user=${OVS_USER_ID} \
           restart $OPTIONS
 TimeoutSec=300
+
+[Install]
+WantedBy=multi-user.target
+RequiresBy=ovsdb-server.service
diff --git a/developers/systemctl/ovsdb-server.service b/developers/systemctl/ovsdb-server.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Open vSwitch Database Unit
 After=syslog.target network-pre.target
-Before=network.target network.service
+Before=network.target network.service kubelet.service
 Wants=ovs-delete-transient-ports.service
 
 [Service]
@@ -15,3 +15,6 @@ ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
 ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
            --ovs-user=${OVS_USER_ID} \
            --no-monitor restart $OPTIONS
+
+[Install]
+WantedBy=multi-user.target