Add parameter to customize the number of manilaAPI processes

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Dec 5, 2024 · 55cc6a9 · 55cc6a9
1 parent 2a2058e
commit 55cc6a9
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 1 deletion.
diff --git a/api/bases/manila.openstack.org_manilaapis.yaml b/api/bases/manila.openstack.org_manilaapis.yaml
@@ -537,6 +537,14 @@ spec:
                   - extraVol
                   type: object
                 type: array
+              httpdCustomization:
+                properties:
+                  processNumber:
+                    default: 4
+                    format: int32
+                    minimum: 1
+                    type: integer
+                type: object
               networkAttachments:
                 items:
                   type: string

diff --git a/api/bases/manila.openstack.org_manilas.yaml b/api/bases/manila.openstack.org_manilas.yaml
@@ -558,6 +558,14 @@ spec:
                     items:
                       type: string
                     type: array
+                  httpdCustomization:
+                    properties:
+                      processNumber:
+                        default: 4
+                        format: int32
+                        minimum: 1
+                        type: integer
+                    type: object
                   networkAttachments:
                     items:
                       type: string

diff --git a/api/v1beta1/manilaapi_types.go b/api/v1beta1/manilaapi_types.go
@@ -30,6 +30,18 @@ type ManilaAPITemplate struct {
 	// +kubebuilder:validation:Required
 	// ContainerImage - Manila API Container Image URL
 	ContainerImage string `json:"containerImage"`
+
+	// +kubebuilder:validation:Optional
+	// HttpdCustomization - customize the httpd service
+	HttpdCustomization HttpdCustomization `json:"httpdCustomization,omitempty"`
+}
+
+type HttpdCustomization struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=4
+	// +kubebuilder:validation:Minimum=1
+	// ProcessNumber - Number of processes running in ManilaAPI
+	ProcessNumber *int32 `json:"processNumber"`
 }
 
 // ManilaAPITemplateCore -

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/manila.openstack.org_manilaapis.yaml b/config/crd/bases/manila.openstack.org_manilaapis.yaml
@@ -537,6 +537,14 @@ spec:
                   - extraVol
                   type: object
                 type: array
+              httpdCustomization:
+                properties:
+                  processNumber:
+                    default: 4
+                    format: int32
+                    minimum: 1
+                    type: integer
+                type: object
               networkAttachments:
                 items:
                   type: string

diff --git a/config/crd/bases/manila.openstack.org_manilas.yaml b/config/crd/bases/manila.openstack.org_manilas.yaml
@@ -558,6 +558,14 @@ spec:
                     items:
                       type: string
                     type: array
+                  httpdCustomization:
+                    properties:
+                      processNumber:
+                        default: 4
+                        format: int32
+                        minimum: 1
+                        type: integer
+                    type: object
                   networkAttachments:
                     items:
                       type: string

diff --git a/controllers/manila_controller.go b/controllers/manila_controller.go
@@ -897,6 +897,7 @@ func (r *ManilaReconciler) generateServiceConfig(
 			manila.DatabaseCRName),
 		"MemcachedServersWithInet": memcached.GetMemcachedServerListWithInetString(),
 		"TimeOut":                  instance.Spec.APITimeout,
+		"Workers":                  instance.Spec.ManilaAPI.HttpdCustomization.ProcessNumber,
 	}
 
 	// create httpd  vhost template parameters

diff --git a/templates/manila/config/10-manila_wsgi.conf b/templates/manila/config/10-manila_wsgi.conf
@@ -32,7 +32,7 @@
 
   ## WSGI configuration
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=manila processes=4 threads=1 user=manila
+  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=manila processes={{ $.Workers }} threads=1 user=manila
   WSGIProcessGroup {{ $endpt }}
   WSGIScriptAlias / "/var/www/cgi-bin/manila/manila-wsgi"
   WSGIPassAuthorization On