Skip to content

Commit

Permalink
Merge pull request #4087 from sdodson/OCPBUGS-25406-master
Browse files Browse the repository at this point in the history
OCPBUGS-25406: Azure Run ovs-configuration.service before dnsmasq.service
  • Loading branch information
openshift-merge-bot[bot] authored Jan 5, 2024
2 parents e0dda82 + d638d96 commit 854a866
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions templates/common/azure/units/ovs-configuration.service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: ovs-configuration.service
enabled: {{if eq .NetworkType "OVNKubernetes" "OpenShiftSDN"}}true{{else}}false{{end}}
contents: |
[Unit]
Description=Configures OVS with proper host networking configuration
# This service is used to move a physical NIC into OVS and reconfigure OVS to use the host IP
Requires=openvswitch.service
Wants=NetworkManager-wait-online.service
After=firstboot-osupdate.target
After=NetworkManager-wait-online.service openvswitch.service network.service nodeip-configuration.service
Before=kubelet-dependencies.target node-valid-hostname.service dnsmasq.service
[Service]
# Need oneshot to delay kubelet
Type=oneshot
ExecStart=/usr/local/bin/configure-ovs.sh {{.NetworkType}}
StandardOutput=journal+console
StandardError=journal+console
[Install]
RequiredBy=kubelet-dependencies.target

0 comments on commit 854a866

Please sign in to comment.