Skip to content

Commit b977d2e

Browse files
Merge pull request openstack-k8s-operators#1163 from fao89/OSPRH-10965
Set Heat timeout
2 parents e3b5ce5 + b2bd44d commit b977d2e

File tree

4 files changed

+201
-58
lines changed

4 files changed

+201
-58
lines changed

apis/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,10 @@ func (r *OpenStackControlPlane) DefaultServices() {
860860
r.Spec.Heat.Template = &heatv1.HeatSpecCore{}
861861
}
862862
r.Spec.Heat.Template.Default()
863+
initializeOverrideSpec(&r.Spec.Heat.APIOverride.Route, true)
864+
r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.APIOverride.Route.Annotations)
865+
initializeOverrideSpec(&r.Spec.Heat.CnfAPIOverride.Route, true)
866+
r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.CnfAPIOverride.Route.Annotations)
863867
}
864868

865869
// Swift

0 commit comments

Comments
 (0)