From f6032feca07773a8d78df0cfe811c4f9b77c48ab Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 30 Oct 2024 13:29:43 +1000 Subject: [PATCH 1/2] Add HeatStackDomainAdminPassword to test secret Add the HeatStackDomainAdminPassword to heat functional test env Signed-off-by: Brendan Shephard --- tests/functional/base_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go index 311efd9c..f29ffc66 100644 --- a/tests/functional/base_test.go +++ b/tests/functional/base_test.go @@ -35,7 +35,9 @@ func GetDefaultHeatSpec() map[string]interface{} { "heatAPI": GetDefaultHeatAPISpec(), "heatCfnAPI": GetDefaultHeatCFNAPISpec(), "passwordSelectors": map[string]interface{}{ - "AuthEncryptionKey": "HeatAuthEncryptionKey", + "AuthEncryptionKey": "HeatAuthEncryptionKey", + "StackDomainAdminPassword": "HeatStackDomainAdminPassword", + "Service": "HeatPassword", }, } } @@ -78,8 +80,9 @@ func CreateHeatSecret(namespace string, name string) *corev1.Secret { return th.CreateSecret( types.NamespacedName{Namespace: namespace, Name: name}, map[string][]byte{ - "HeatPassword": []byte("12345678"), - "HeatAuthEncryptionKey": []byte("1234567812345678123456781212345678345678"), + "HeatPassword": []byte("12345678"), + "HeatAuthEncryptionKey": []byte("1234567812345678123456781212345678345678"), + "HeatStackDomainAdminPassword": []byte("12345678"), }, ) } From afc9598b6dd3e9240e10b3adbbf8468190ec1bc3 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 30 Oct 2024 13:34:31 +1000 Subject: [PATCH 2/2] Ensure StackDomainAdminPassword is reflected in heat.conf Signed-off-by: Brendan Shephard --- tests/functional/heat_controller_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/functional/heat_controller_test.go b/tests/functional/heat_controller_test.go index e77da21c..6692eea3 100644 --- a/tests/functional/heat_controller_test.go +++ b/tests/functional/heat_controller_test.go @@ -341,6 +341,8 @@ var _ = Describe("Heat controller", func() { heatName.Namespace, heatName.Namespace, heatName.Namespace))) Expect(heatCfg).Should( ContainSubstring("tls_enabled=false")) + Expect(heatCfg).Should( + ContainSubstring("stack_domain_admin_password=12345678")) Expect(string(cm.Data["my.cnf"])).To( ContainSubstring("[client]\nssl=0")) Expect(string(cm.Data["heat-api-httpd.conf"])).To(