ztp: remove prepending var to path

openshift-kni · Mar 10, 2022 · 539b32f · 539b32f
1 parent 20e975d
commit 539b32f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/ztp/siteconfig-generator/siteConfig/siteConfig.go b/ztp/siteconfig-generator/siteConfig/siteConfig.go
@@ -258,6 +258,8 @@ func (prt *Partitions) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		err = fmt.Errorf("choose an appropritate disk size. must be greater than 0")
 	}
 
+	// run a clean to ensure path is not malformed
+	defaults.MountPoint = path.Clean(defaults.MountPoint)
 	// it's a required field
 	if defaults.MountPoint == "" {
 		err = fmt.Errorf("must provide a path for mount_point. e.g /var/path")
@@ -266,14 +268,6 @@ func (prt *Partitions) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if !(path.IsAbs(defaults.MountPoint)) {
 		defaults.MountPoint = path.Join("/", defaults.MountPoint)
 	}
-	// https://docs.openshift.com/container-platform/4.9/installing/installing_bare_metal/installing-bare-metal.html#installation-user-infra-machines-advanced_vardisk_installing-bare-metal
-	// starts at var
-	if !(strings.HasPrefix(defaults.MountPoint, "/var")) {
-		defaults.MountPoint = path.Join("/var", defaults.MountPoint)
-	} else {
-		// run a clean to ensure path is not malformed
-		defaults.MountPoint = path.Clean(defaults.MountPoint)
-	}
 
 	// generate label from path
 	defaults.Label = strings.ReplaceAll(defaults.MountPoint[1:], "/", "-")

diff --git a/ztp/siteconfig-generator/siteConfig/siteConfigBuilder_test.go b/ztp/siteconfig-generator/siteConfig/siteConfigBuilder_test.go
@@ -69,7 +69,7 @@ spec:
         diskPartition:
            - device: /dev/sda
              partitions:
-               - mount_point: imageregistry
+               - mount_point: /var/imageregistry
                  size: 102500
                  start: 344844
 `