Merge pull request openshift#4079 from cybertron/wait-for-br-ex-unrevert

OCPBUGS-22324: Revert "Revert "Merge pull request openshift#4028 from cybertron/wait-for-br-ex""
stbenjam · Feb 13, 2024 · 4e12d91 · 4e12d91
2 parents b8d339c + 7e2e27a
commit 4e12d91
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml b/templates/common/on-prem/files/NetworkManager-resolv-prepender.yaml
@@ -64,6 +64,9 @@ contents:
                   hostnamectl set-hostname --static --transient $DHCP6_FQDN_FQDN
            fi
         fi
+        if [[ "$STATUS" == "up" ]] && [[ $IFACE == "br-ex" ]]; then
+            touch /run/nodeip-configuration/br-ex-up
+        fi
       ;;
       *)
       ;;

diff --git a/templates/common/on-prem/files/wait-for-br-ex-up.yaml b/templates/common/on-prem/files/wait-for-br-ex-up.yaml
@@ -0,0 +1,10 @@
+mode: 0755
+path: "/usr/local/bin/wait-for-br-ex-up.sh"
+contents:
+  inline: |
+    #!/bin/bash
+
+    until [ -e /run/nodeip-configuration/br-ex-up ]
+    do
+      sleep 1
+    done
diff --git a/templates/common/on-prem/units/wait-for-br-ex-up.yaml b/templates/common/on-prem/units/wait-for-br-ex-up.yaml
@@ -0,0 +1,15 @@
+name: wait-for-br-ex-up.service
+enabled: {{if and (gt (len (onPremPlatformAPIServerInternalIPs .)) 0) (eq .NetworkType "OVNKubernetes")}}true{{else}}false{{end}}
+contents: |
+  [Unit]
+  Description=Wait for br-ex up event from NetworkManager
+  Wants=ovs-configuration.service
+  After=ovs-configuration.service
+  Before=node-valid-hostname.service
+
+  [Service]
+  Type=oneshot
+  ExecStart=/usr/local/bin/wait-for-br-ex-up.sh
+
+  [Install]
+  RequiredBy=node-valid-hostname.service