🌱 Backport E2E test fixes #1420

k8s-ci-robot merged 2 commits intokubernetes-sigs:release-0.7kubernetes-sigs/cluster-api-provider-openstack:release-0.7from

shiftstack:release-0.7-patchesshiftstack/cluster-api-provider-openstack:release-0.7-patchesCopy head branch name to clipboard