Allow growvols args to be overridden

olliewalsh · Jun 15, 2023 · ce2a0d3 · ce2a0d3
1 parent 93a8f25
commit ce2a0d3
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 2 deletions.
diff --git a/api/v1beta1/openstackbaremetalset_types.go b/api/v1beta1/openstackbaremetalset_types.go
@@ -54,6 +54,9 @@ type OpenStackBaremetalSetSpec struct {
 	// Note that subsequent TripleO deployment will overwrite these values
 	BootstrapDNS     []string `json:"bootstrapDns,omitempty"`
 	DNSSearchDomains []string `json:"dnsSearchDomains,omitempty"`
+	// GrowvolsArgs - arguments to the growvols command to expand logical volumes after provisioning
+	// Note requires the command to exist on the base image
+	GrowvolsArgs []string `json:growvolsArgs, omitempty`
 }
 
 // OpenStackBaremetalSetStatus defines the observed state of OpenStackBaremetalSet

diff --git a/api/v1beta1/openstackvmset_types.go b/api/v1beta1/openstackvmset_types.go
@@ -74,6 +74,9 @@ type OpenStackVMSetSpec struct {
 	// Note that subsequent TripleO deployment will overwrite these values
 	BootstrapDNS     []string `json:"bootstrapDns,omitempty"`
 	DNSSearchDomains []string `json:"dnsSearchDomains,omitempty"`
+	// GrowvolsArgs - arguments to the growvols command to expand logical volumes after provisioning
+	// Note requires the command to exist on the base image
+	GrowvolsArgs []string `json:growvolsArgs, omitempty`
 }
 
 // OpenStackVMSetStatus defines the observed state of OpenStackVMSet

diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
@@ -908,6 +908,14 @@ func (r *OpenStackBaremetalSetReconciler) baremetalHostProvision(
 	templateParameters["Hostname"] = bmhStatus.Hostname
 	templateParameters["DomainName"] = osNetCfg.Spec.DomainName
 
+	if instance.Spec.GrowvolsArgs != nil && len(instance.Spec.GrowvolsArgs) > 0 {
+		templateParameters["GrowvolsArgs"] = instance.Spec.GrowvolsArgs
+
+	} else {
+		// use default for the role name
+		templateParameters["GrowvolsArgs"] = GetRoleGrowvolsArgs(instance.Spec.RoleName)
+	}
+
 	//
 	// use same NodeRootPassword paremater as tripleo have
 	//

diff --git a/controllers/openstackvmset_controller.go b/controllers/openstackvmset_controller.go
@@ -350,6 +350,14 @@ func (r *OpenStackVMSetReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	//
 	templateParameters["DomainName"] = osNetCfg.Spec.DomainName
 
+	if instance.Spec.GrowvolsArgs != nil && len(instance.Spec.GrowvolsArgs) > 0 {
+		templateParameters["GrowvolsArgs"] = instance.Spec.GrowvolsArgs
+
+	} else {
+		// use default for the role name
+		templateParameters["GrowvolsArgs"] = GetRoleGrowvolsArgs(instance.Spec.RoleName)
+	}
+
 	//
 	// check if PasswordSecret got specified and if it exists before creating the controlplane
 	//

diff --git a/pkg/common/const.go b/pkg/common/const.go
@@ -51,3 +51,36 @@ const (
 	// TripleORolesDataFile -
 	TripleORolesDataFile = "roles_data.yaml"
 )
+
+func GetRoleGrowvolsArgs(role string) string[] {
+	if role == "Controller" {
+		return string[]{
+			"/=8GB",
+			"/tmp=1GB",
+			"/var/log=10GB",
+			"/var/log/audit=2GB",
+			"/home=1GB",
+			"/var=90%",
+			"/srv=10%"
+		}
+	}
+	if role == "ObjectStorage" {
+		return string[]{
+			"/=8GB",
+			"/tmp=1GB",
+			"/var/log=10GB",
+			"/var/log/audit=2GB",
+			"/home=1GB",
+			"/var=10%",
+			"/srv=90%"
+		}
+	}
+	return string[]{
+		"/=8GB",
+		"/tmp=1GB",
+		"/var/log=10GB",
+		"/var/log/audit=2GB",
+		"/home=1GB",
+		"/var=100%"
+	}
+}
diff --git a/templates/baremetalset/cloudinit/userdata b/templates/baremetalset/cloudinit/userdata
@@ -17,4 +17,4 @@ bootcmd:
   - set -x; if [ -e /boot/loader/entries/ffffffffffffffffffffffffffffffff-* ]; then MACHINEID=$(cat /etc/machine-id) && rename "ffffffffffffffffffffffffffffffff" "$MACHINEID" /boot/loader/entries/ffffffffffffffffffffffffffffffff-* ; fi
 runcmd:
   # grow volumes on hardened image if command exists
-  - if [ -e /usr/local/sbin/growvols ]; then /usr/local/sbin/growvols --yes /=8GB /tmp=1GB /var/log=10GB /var/log/audit=2GB /home=1GB /var=100%; fi
+  - if [ -e /usr/local/sbin/growvols ]; then /usr/local/sbin/growvols --yes {{ range .GrowvolsArgs}}{{.|trim}} {{end}}; fi
diff --git a/templates/vmset/cloudinit/userdata b/templates/vmset/cloudinit/userdata
@@ -32,5 +32,5 @@ runcmd:
   # Disable IPv6 autoconf per default, we only want the ooo static IP config
   - set -x; echo 'IPV6_AUTOCONF=no' >> /etc/sysconfig/network
   # grow volumes on hardened image if command exists
-  - if [ -e /usr/local/sbin/growvols ]; then /usr/local/sbin/growvols --yes /=8GB /tmp=1GB /var/log=10GB /var/log/audit=2GB /home=1GB /var=100%; fi
+  - if [ -e /usr/local/sbin/growvols ]; then /usr/local/sbin/growvols --yes {{ range .GrowvolsArgs}}{{.|trim}} {{end}}; fi
 {{- end }}