cfg test

stuggi · Apr 11, 2024 · ddd9ef3 · ddd9ef3
1 parent 99e2828
commit ddd9ef3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/controllers/amphoracontroller_controller.go b/controllers/amphoracontroller_controller.go
@@ -747,6 +747,7 @@ func (r *OctaviaAmphoraControllerReconciler) generateServiceConfigMaps(
 	// TODO(gthiemonge) store keys/passwords/passphrases in a specific config file stored in a secret
 	templateParameters["HeartbeatKey"] = string(ospSecret.Data["OctaviaHeartbeatKey"])
 	templateParameters["JobboardBackendHosts"] = redis.GetRedisServerListString()
+	templateParameters["RedisPort"] = redis.GetRedisPortString()
 	templateParameters["RedisTLS"] = redis.GetRedisTLSSupport()
 
 	// TODO(beagles): populate the template parameters

diff --git a/go.mod b/go.mod
@@ -91,6 +91,6 @@ replace github.com/openstack-k8s-operators/octavia-operator/api => ./api
 // must consistent within modules and service operators
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
 
-replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/stuggi/infra-operator/apis v0.0.0-20240410143430-72f4a4060cc6
+replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/stuggi/infra-operator/apis v0.0.0-20240411081437-2dd410534d6a
 
 replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20240410091541-d22e3276c3a1
diff --git a/go.sum b/go.sum
@@ -105,8 +105,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stuggi/infra-operator/apis v0.0.0-20240410143430-72f4a4060cc6 h1:ltjNZxgAeRUKmy0Zn5vmnDzzxoSzl7FiByO418l1xys=
-github.com/stuggi/infra-operator/apis v0.0.0-20240410143430-72f4a4060cc6/go.mod h1:ii0O3I9B+mkX6/D8qDQjg/q76sojufkYhM7bq7qo41E=
+github.com/stuggi/infra-operator/apis v0.0.0-20240411081437-2dd410534d6a h1:gEi/GGBcVyMfXJgouh0FDydB7+jiGzucfdk5+xaPgVg=
+github.com/stuggi/infra-operator/apis v0.0.0-20240411081437-2dd410534d6a/go.mod h1:ii0O3I9B+mkX6/D8qDQjg/q76sojufkYhM7bq7qo41E=
 github.com/stuggi/lib-common/modules/common v0.0.0-20240410091541-d22e3276c3a1 h1:1OKJEAaKTAlP4HGiWOALqnD0L0Ad4LIru1kOCwobQck=
 github.com/stuggi/lib-common/modules/common v0.0.0-20240410091541-d22e3276c3a1/go.mod h1:gqByVGUdKQB/NkhKV4eD+8NWYkHq961nC96rTCB3ywE=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/templates/octaviaamphoracontroller/config/octavia.conf b/templates/octaviaamphoracontroller/config/octavia.conf
@@ -46,12 +46,9 @@ client_ca = /etc/octavia/certs/client_ca.cert.pem
 persistence_connection = {{ .PersistenceDatabaseConnection }}
 jobboard_enabled = True
 jobboard_backend_hosts = {{ .JobboardBackendHosts }}
-#{{ if (index . "TransportURL") }}
-jobboard_redis_backend_ssl_options = ssl:{{ .RedisTLS }},ssl_cert_reqs:'required'
-#jobboard_redis_backend_ssl_options = ssl:False,ssl_ca_certs:None,ssl_cert_reqs:required,ssl_certfile:None,ssl_keyfile:None
-#{{ end }}
+jobboard_backend_port = {{ .RedisPort }}
+jobboard_redis_backend_ssl_options = ssl:{{ .RedisTLS }},ssl_cert_reqs:'required',ssl_certfile:None,ssl_keyfile:None
 # TODO(gthiemonge) enable sentinel when it is exposed in the redis service.
-#jobboard_backend_port = 26379
 #jobboard_backend_password = ""
 #jobboard_redis_sentinel = redis
 [oslo_messaging]