Add parameter to customize the number of cinderAPI processes

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Dec 5, 2024 · 6a4a70a · 6a4a70a
1 parent b7c58e0
commit 6a4a70a
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 1 deletion.
diff --git a/api/bases/cinder.openstack.org_cinderapis.yaml b/api/bases/cinder.openstack.org_cinderapis.yaml
@@ -536,6 +536,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/cinder.openstack.org_cinders.yaml b/api/bases/cinder.openstack.org_cinders.yaml
@@ -50,6 +50,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/cinderapi_types.go b/api/v1beta1/cinderapi_types.go
@@ -51,6 +51,19 @@ type CinderAPITemplate struct {
 	ContainerImage string `json:"containerImage"`
 
 	CinderAPITemplateCore `json:",inline"`
+
+	// +kubebuilder:validation:Optional
+	// HttpdCustomization - customize the httpd service
+	HttpdCustomization HttpdCustomization `json:"httpdCustomization,omitempty"`
+}
+
+// HttpdCustomization -
+type HttpdCustomization struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=4
+	// +kubebuilder:validation:Minimum=1
+	// ProcessNumber - Number of processes running in Cinder API
+	ProcessNumber *int32 `json:"processNumber"`
 }
 
 // APIOverrideSpec to override the generated manifest of several child resources.

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cinder.openstack.org_cinderapis.yaml b/config/crd/bases/cinder.openstack.org_cinderapis.yaml
@@ -536,6 +536,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/cinder.openstack.org_cinders.yaml b/config/crd/bases/cinder.openstack.org_cinders.yaml
@@ -50,6 +50,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/cinder_controller.go b/controllers/cinder_controller.go
@@ -924,6 +924,7 @@ func (r *CinderReconciler) generateServiceConfigs(
 		cinder.DatabaseName)
 	templateParameters["MemcachedServersWithInet"] = memcached.GetMemcachedServerListWithInetString()
 	templateParameters["TimeOut"] = instance.Spec.APITimeout
+	templateParameters["Workers"] = instance.Spec.CinderAPI.HttpdCustomization.ProcessNumber
 
 	// create httpd  vhost template parameters
 	httpdVhostConfig := map[string]interface{}{}

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