Merge pull request #500 from Deydra71/customize-process-number

Make process number configurable in KeystoneAPI
openstack-k8s-operators · Nov 22, 2024 · 322aab6 · 322aab6
2 parents 18b7410 + b52ef01
commit 322aab6
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 1 deletion.
diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -103,6 +103,17 @@ spec:
                 format: int32
                 minimum: 1
                 type: integer
+              httpdCustomization:
+                description: HttpdCustomization - customize the httpd service
+                properties:
+                  processNumber:
+                    default: 3
+                    description: ProcessNumber - Number of processes running in keystone
+                      API
+                    format: int32
+                    minimum: 1
+                    type: integer
+                type: object
               memcachedInstance:
                 default: memcached
                 description: Memcached instance name.

diff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go
@@ -157,6 +157,10 @@ type KeystoneAPISpecCore struct {
 	// TODO: -> implement
 	DefaultConfigOverwrite map[string]string `json:"defaultConfigOverwrite,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	// HttpdCustomization - customize the httpd service
+	HttpdCustomization HttpdCustomization `json:"httpdCustomization,omitempty"`
+
 	// +kubebuilder:validation:Optional
 	// Resources - Compute Resources required by this service (Limits/Requests).
 	// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
@@ -197,6 +201,15 @@ type PasswordSelector struct {
 	Admin string `json:"admin"`
 }
 
+// HttpdCustomization - customize the httpd service
+type HttpdCustomization struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=3
+	// +kubebuilder:validation:Minimum=1
+	// ProcessNumber - Number of processes running in keystone API
+	ProcessNumber *int32 `json:"processNumber"`
+}
+
 // KeystoneAPIStatus defines the observed state of KeystoneAPI
 type KeystoneAPIStatus struct {
 	// ReadyCount of keystone API instances

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
@@ -103,6 +103,17 @@ spec:
                 format: int32
                 minimum: 1
                 type: integer
+              httpdCustomization:
+                description: HttpdCustomization - customize the httpd service
+                properties:
+                  processNumber:
+                    default: 3
+                    description: ProcessNumber - Number of processes running in keystone
+                      API
+                    format: int32
+                    minimum: 1
+                    type: integer
+                type: object
               memcachedInstance:
                 default: memcached
                 description: Memcached instance name.

diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -1196,6 +1196,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 			keystone.DatabaseName,
 		),
 		"enableSecureRBAC": instance.Spec.EnableSecureRBAC,
+		"ProcessNumber":    instance.Spec.HttpdCustomization.ProcessNumber,
 	}
 
 	// create httpd  vhost template parameters

diff --git a/templates/keystoneapi/config/httpd.conf b/templates/keystoneapi/config/httpd.conf
@@ -53,7 +53,7 @@ CustomLog /dev/stdout proxy env=forwarded
 
   ## WSGI configuration
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=keystone processes=3 threads=1 user=keystone
+  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=keystone processes={{ $.ProcessNumber }} threads=1 user=keystone
   WSGIProcessGroup {{ $endpt }}
   WSGIScriptAlias / "/usr/bin/keystone-wsgi-public"
   WSGIPassAuthorization On