Update NM's non_vip prependers

openshift · Mar 13, 2020 · 534531b · 534531b
1 parent 77cf01b
commit 534531b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 39 deletions.
diff --git a/templates/worker/00-worker/baremetal/files/NetworkManager-non-virtual-ip-prepender.yaml b/templates/worker/00-worker/baremetal/files/NetworkManager-non-virtual-ip-prepender.yaml
@@ -9,7 +9,7 @@ contents:
     case "$STATUS" in
         pre-up)
         logger -s "NM non-virtual-ip-prepender triggered by pre-upping ${1}."
-        NON_VIRTUAL_IP=$(/usr/local/bin/non_virtual_ip \
+        NON_VIRTUAL_IP=$(/usr/local/bin/machine-config-daemon node-ip show \
             "{{.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP}}" \
             "{{.Infra.Status.PlatformStatus.BareMetal.NodeDNSIP}}" \
             "{{.Infra.Status.PlatformStatus.BareMetal.IngressIP}}")
@@ -38,4 +38,4 @@ contents:
         ;;
         *)
         ;;
-    esac
+    esac
diff --git a/templates/worker/00-worker/baremetal/files/baremetal-non-virtual-ip.yaml b/templates/worker/00-worker/baremetal/files/baremetal-non-virtual-ip.yaml
diff --git a/templates/worker/00-worker/openstack/files/NetworkManager-non-virtual-ip-prepender.yaml b/templates/worker/00-worker/openstack/files/NetworkManager-non-virtual-ip-prepender.yaml
@@ -9,7 +9,7 @@ contents:
     case "$STATUS" in
         pre-up)
         logger -s "NM non-virtual-ip-prepender triggered by pre-upping ${1}."
-        NON_VIRTUAL_IP=$(/usr/local/bin/non_virtual_ip \
+        NON_VIRTUAL_IP=$(/usr/local/bin/machine-config-daemon node-ip show \
             "{{.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP}}" \
             "{{.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP}}" \
             "{{.Infra.Status.PlatformStatus.OpenStack.IngressIP}}")

diff --git a/templates/worker/00-worker/openstack/files/openstack-non-virtual-ip.yaml b/templates/worker/00-worker/openstack/files/openstack-non-virtual-ip.yaml
diff --git a/templates/worker/00-worker/ovirt/files/ovirt-non-virtual-ip.yaml b/templates/worker/00-worker/ovirt/files/ovirt-non-virtual-ip.yaml