Skip to content

Commit

Permalink
Merge pull request #465 from bshephar/heat-domain-admin-password-test
Browse files Browse the repository at this point in the history
Heat domain admin password test
  • Loading branch information
openshift-merge-bot[bot] authored Oct 30, 2024
2 parents c2f377d + afc9598 commit f2fd2a1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tests/functional/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
}
Expand Down Expand Up @@ -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"),
},
)
}
Expand Down
2 changes: 2 additions & 0 deletions tests/functional/heat_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit f2fd2a1

Please sign in to comment.