Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug 1861773: Remove IPI checks for vsphere hostname script and systemd unit #1976

Merged
merged 1 commit into from Aug 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions templates/common/vsphere/files/vsphere-hostname.yaml
Expand Up @@ -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

Expand All @@ -16,9 +11,4 @@ contents:
/usr/bin/hostnamectl --transient --static set-hostname ${hostname}
fi
fi
{{ end -}}
{{ end -}}
{{ end -}}
{{ end -}}
{{ end -}}

10 changes: 0 additions & 10 deletions 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
Expand All @@ -18,9 +13,4 @@ contents: |

[Install]
WantedBy=multi-user.target
{{ end -}}
{{ end -}}
{{ end -}}
{{ end -}}
{{ end -}}