Merge pull request #1976 from enxebre/bug-1861773

bug 1861773: Remove IPI checks for vsphere hostname script and systemd unit
openshift · Aug 5, 2020 · 2d538f4 · 2d538f4
2 parents 2146dd0 + e1b793e
commit 2d538f4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/templates/common/vsphere/files/vsphere-hostname.yaml b/templates/common/vsphere/files/vsphere-hostname.yaml
@@ -3,11 +3,6 @@ mode: 0755
 path: "/usr/local/bin/vsphere-hostname.sh"
 contents:
   inline: |
-    {{ if .Infra -}}
-    {{ if .Infra.Status -}}
-    {{ if .Infra.Status.PlatformStatus -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere -}}
-    {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
     #!/usr/bin/env bash
     set -e
 
@@ -16,9 +11,4 @@ contents:
           /usr/bin/hostnamectl --transient --static set-hostname ${hostname}
       fi
     fi
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
-    {{ end -}}
 
diff --git a/templates/common/vsphere/units/vsphere-hostname.yaml b/templates/common/vsphere/units/vsphere-hostname.yaml
@@ -1,11 +1,6 @@
 name: "vsphere-hostname.service"
 enabled: true
 contents: |
-  {{ if .Infra -}}
-  {{ if .Infra.Status -}}
-  {{ if .Infra.Status.PlatformStatus -}}
-  {{ if .Infra.Status.PlatformStatus.VSphere -}}
-  {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
   [Unit]
   Description=vSphere hostname
   After=vmtoolsd.service
@@ -18,9 +13,4 @@ contents: |
 
   [Install]
   WantedBy=multi-user.target
-  {{ end -}}
-  {{ end -}}
-  {{ end -}}
-  {{ end -}}
-  {{ end -}}