From 534531b5b475d2d12253bd7860c882e0f92d1fff Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Fri, 13 Mar 2020 09:55:08 +0100
Subject: [PATCH] Update NM's non_vip prependers

---
 .../NetworkManager-non-virtual-ip-prepender.yaml     |  4 ++--
 .../baremetal/files/baremetal-non-virtual-ip.yaml    | 12 ------------
 .../NetworkManager-non-virtual-ip-prepender.yaml     |  2 +-
 .../openstack/files/openstack-non-virtual-ip.yaml    | 12 ------------
 .../00-worker/ovirt/files/ovirt-non-virtual-ip.yaml  | 12 ------------
 5 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 templates/worker/00-worker/baremetal/files/baremetal-non-virtual-ip.yaml
 delete mode 100644 templates/worker/00-worker/openstack/files/openstack-non-virtual-ip.yaml
 delete mode 100644 templates/worker/00-worker/ovirt/files/ovirt-non-virtual-ip.yaml

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
index 98481685f7..a9f7dda77c 100644
--- 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
\ No newline at end of file
+    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
deleted file mode 100644
index d82386bfcb..0000000000
--- a/templates/worker/00-worker/baremetal/files/baremetal-non-virtual-ip.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-filesystem: "root"
-mode: 0755
-path: "/usr/local/bin/non_virtual_ip"
-contents:
-  inline: |
-    #!/usr/bin/bash
-    podman run --rm \
-      --authfile /var/lib/kubelet/config.json \
-      --net=host \
-      --entrypoint=/usr/bin/non-virtual-ip \
-      {{ .Images.baremetalRuntimeCfgImage }} \
-      ${@}
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
index 9607da4138..ab49fb91fa 100644
--- 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
deleted file mode 100644
index d82386bfcb..0000000000
--- a/templates/worker/00-worker/openstack/files/openstack-non-virtual-ip.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-filesystem: "root"
-mode: 0755
-path: "/usr/local/bin/non_virtual_ip"
-contents:
-  inline: |
-    #!/usr/bin/bash
-    podman run --rm \
-      --authfile /var/lib/kubelet/config.json \
-      --net=host \
-      --entrypoint=/usr/bin/non-virtual-ip \
-      {{ .Images.baremetalRuntimeCfgImage }} \
-      ${@}
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
deleted file mode 100644
index d82386bfcb..0000000000
--- a/templates/worker/00-worker/ovirt/files/ovirt-non-virtual-ip.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-filesystem: "root"
-mode: 0755
-path: "/usr/local/bin/non_virtual_ip"
-contents:
-  inline: |
-    #!/usr/bin/bash
-    podman run --rm \
-      --authfile /var/lib/kubelet/config.json \
-      --net=host \
-      --entrypoint=/usr/bin/non-virtual-ip \
-      {{ .Images.baremetalRuntimeCfgImage }} \
-      ${@}