Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#1164 from bshephar/enable-…
Browse files Browse the repository at this point in the history
…heat-in-func-tests

Enable Heat in functional tests
  • Loading branch information
openshift-merge-bot[bot] authored Oct 30, 2024
2 parents ee60bfa + ee030cf commit 1276a85
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
11 changes: 11 additions & 0 deletions tests/functional/ctlplane/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,13 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
ironicTemplate := map[string]interface{}{
"ironicConductors": []interface{}{},
}
heatTemplate := map[string]interface{}{
"databaseInstance": "openstack",
"secret": "osp-secret",
"passwordSelectors": map[string]interface{}{
"AuthEncryptionKey": "HeatAuthEncryptionKey",
},
}

return map[string]interface{}{
"secret": "osp-secret",
Expand Down Expand Up @@ -472,6 +479,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
"manila": map[string]interface{}{
"enabled": true,
},
"heat": map[string]interface{}{
"enabled": true,
"template": heatTemplate,
},
}
}

Expand Down
3 changes: 3 additions & 0 deletions tests/functional/ctlplane/openstackversion_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ var _ = Describe("OpenStackOperator controller", func() {
spec["manila"] = map[string]interface{}{
"enabled": false,
}
spec["heat"] = map[string]interface{}{
"enabled": false,
}
spec["tls"] = GetTLSPublicSpec()
spec["ovn"] = map[string]interface{}{
"enabled": true,
Expand Down

0 comments on commit 1276a85

Please sign in to comment.