Make it able to bring your own OpenStack volume

Signed-off-by: Max Rantil <[email protected]>

Author: Max Rantil

hack/ci/cloud-init/controller.yaml.tpl

@@ -150,6 +150,10 @@
         openstack aggregate add host "$aggregateid" "$host"
     done
 
+    # Create volume type with OS_CLOUD admin
+    OS_CLOUD=capo-e2e-admin
+    openstack volume type create --description "Test volume type" --public "test-volume-type"
+
     # the flavors are created in a way that we can execute at least 2 e2e tests in parallel (overall we have 32 vCPUs)
     openstack flavor delete m1.tiny
     openstack flavor create --ram 512 --disk 1 --ephemeral 1 --vcpus 1 --public --id 1 m1.tiny --property hw_rng:allowed='True'

test/e2e/suites/e2e/e2e_test.go

@@ -57,7 +57,6 @@ import (
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
-	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 	"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
 )
 
@@ -898,16 +897,20 @@ func createTestVolumeType(e2eCtx *shared.E2EContext) {
 	volumeClient, err := openstack.NewBlockStorageV3(providerClient, gophercloud.EndpointOpts{Region: clientOpts.RegionName})
 	Expect(err).NotTo(HaveOccurred())
 
-	shared.Logf("Creating test volume type")
-	_, err = volumetypes.Create(volumeClient, &volumetypes.CreateOpts{
-		Name:        e2eCtx.E2EConfig.GetVariable(shared.OpenStackVolumeTypeAlt),
-		Description: "Test volume type",
-		IsPublic:    pointer.Bool(true),
-		ExtraSpecs:  map[string]string{},
-	}).Extract()
-	if capoerrors.IsConflict(err) {
-		shared.Logf("Volume type already exists. This may happen in development environments, but it is not expected in CI.")
-		return
+	volumeTypeName := e2eCtx.E2EConfig.GetVariable(shared.OpenStackVolumeTypeAlt)
+
+	shared.Logf("Checking if test volume type '%s' exists", volumeTypeName)
+
+	Eventually(func() error {
+		shared.Logf("Checking if test volume type '%s' exists", volumeTypeName)
+		_, err := volumetypes.Get(volumeClient, volumeTypeName).Extract()
+		return err
+	}, 30*time.Second, 5*time.Second).Should(Succeed())
+
+	if err != nil {
+		shared.Logf("Error after retries: %v", err)
+		Expect(err).NotTo(HaveOccurred())
 	}
-	Expect(err).NotTo(HaveOccurred())
+
+	shared.Logf("Proceeding with volume type '%s'.", volumeTypeName)
 }