Enable platform dependent bootstrap ignition files

Some of the additions made should only be enabled for the baremetal platform, so move these to data/data/bootstrap/baremetal and adjust the code to conditionally read this depending on the platform name. Closes: #62 Related: #64
openshift-metal3 · Jun 11, 2019 · eec38a3 · eec38a3
1 parent f92e7f9
commit eec38a3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 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,24 @@ func (a *Bootstrap) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return err
 	}
+
+	// Check for optional platform specific directories
+	platform := installConfig.Config.Platform.Name()
+	platformFilePath := fmt.Sprintf("bootstrap/%s/files", platform)
+	if _, err := os.Stat(platformFilePath); !os.IsNotExist(err) {
+		err = a.addStorageFiles("/", platformFilePath, templateData)
+		if err != nil {
+			return err
+		}
+	}
+	platformUnitPath := fmt.Sprintf("bootstrap/%s/units", platform)
+	if _, err := os.Stat(platformUnitPath); !os.IsNotExist(err) {
+		err = a.addSystemdUnits(platformUnitPath, templateData)
+		if err != nil {
+			return err
+		}
+	}
+
 	a.addParentFiles(dependencies)
 
 	a.Config.Passwd.Users = append(