Merge pull request #102 from hardys/baremetal_bootstrap

Enable platform dependent bootstrap ignition files
openshift-metal3 · Jun 14, 2019 · 27dc191 · 27dc191
2 parents f92e7f9 + 6aba139
commit 27dc191
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 2 deletions.
diff --git a/...data/bootstrap/files/etc/coredns/Corefile → ...trap/baremetal/files/etc/coredns/Corefile b/...data/bootstrap/files/etc/coredns/Corefile → ...trap/baremetal/files/etc/coredns/Corefile
diff --git a/...ta/bootstrap/files/etc/dhcp/dhclient.conf → ...ap/baremetal/files/etc/dhcp/dhclient.conf b/...ta/bootstrap/files/etc/dhcp/dhclient.conf → ...ap/baremetal/files/etc/dhcp/dhclient.conf
diff --git a/...files/etc/keepalived/keepalived.conf.tmpl → ...files/etc/keepalived/keepalived.conf.tmpl b/...files/etc/keepalived/keepalived.conf.tmpl → ...files/etc/keepalived/keepalived.conf.tmpl
diff --git a/.../bootstrap/files/usr/local/bin/coredns.sh → .../baremetal/files/usr/local/bin/coredns.sh b/.../bootstrap/files/usr/local/bin/coredns.sh → .../baremetal/files/usr/local/bin/coredns.sh
diff --git a/...otstrap/files/usr/local/bin/keepalived.sh → ...remetal/files/usr/local/bin/keepalived.sh b/...otstrap/files/usr/local/bin/keepalived.sh → ...remetal/files/usr/local/bin/keepalived.sh
diff --git a/...a/bootstrap/systemd/units/coredns.service → ...p/baremetal/systemd/units/coredns.service b/...a/bootstrap/systemd/units/coredns.service → ...p/baremetal/systemd/units/coredns.service
diff --git a/...ootstrap/systemd/units/keepalived.service → ...aremetal/systemd/units/keepalived.service b/...ootstrap/systemd/units/keepalived.service → ...aremetal/systemd/units/keepalived.service
diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -127,6 +127,28 @@ func (a *Bootstrap) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return err
 	}
+
+	// Check for optional platform specific files/units
+	platform := installConfig.Config.Platform.Name()
+	platformFilePath := fmt.Sprintf("bootstrap/%s/files", platform)
+	directory, err := data.Assets.Open(platformFilePath)
+	if directory != nil {
+		directory.Close()
+		err = a.addStorageFiles("/", platformFilePath, templateData)
+		if err != nil {
+			return err
+		}
+	}
+	platformUnitPath := fmt.Sprintf("bootstrap/%s/systemd/units", platform)
+	directory, err = data.Assets.Open(platformUnitPath)
+	if directory != nil {
+		directory.Close()
+		err = a.addSystemdUnits(platformUnitPath, templateData)
+		if err != nil {
+			return err
+		}
+	}
+
 	a.addParentFiles(dependencies)
 
 	a.Config.Passwd.Users = append(
@@ -247,10 +269,11 @@ func (a *Bootstrap) addSystemdUnits(uri string, templateData *bootstrapTemplateD
 		"progress.service":                {},
 		"kubelet.service":                 {},
 		"chown-gatewayd-key.service":      {},
-		"keepalived.service":              {},
-		"coredns.service":                 {},
 		"systemd-journal-gatewayd.socket": {},
 		"approve-csr.service":             {},
+		// baremetal platform services
+		"keepalived.service": {},
+		"coredns.service":    {},
 	}
 
 	directory, err := data.Assets.Open(uri)