Merge pull request #1164 from bshephar/enable-heat-in-func-tests

Enable Heat in functional tests

Author: openshift-merge-bot[bot]

tests/functional/ctlplane/base_test.go

@@ -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",
@@ -472,6 +479,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} {
 		"manila": map[string]interface{}{
 			"enabled": true,
 		},
+		"heat": map[string]interface{}{
+			"enabled":  true,
+			"template": heatTemplate,
+		},
 	}
 }
 

tests/functional/ctlplane/openstackversion_controller_test.go

@@ -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,