openstack: Small refactor of PreProvision

Adjust debug and error messages, scope variables more tightly for
clarity.

Author: pierreprinetti

pkg/infrastructure/openstack/clusterapi/clusterapi.go

@@ -35,37 +35,43 @@ var _ clusterapi.PreProvider = Provider{}
 // PreProvision tags the VIP ports and creates the security groups that are needed during CAPI provisioning.
 func (p Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
 	var (
-		infraID            = in.InfraID
-		installConfig      = in.InstallConfig
-		rhcosImage         = string(*in.RhcosImage)
-		mastersSchedulable bool
+		infraID        = in.InfraID
+		installConfig  = in.InstallConfig
+		rhcosImage     = string(*in.RhcosImage)
+		manifestsAsset = in.ManifestsAsset
 	)
 
-	for _, f := range in.ManifestsAsset.Files() {
-		if f.Filename == manifests.SchedulerCfgFilename {
-			schedulerConfig := configv1.Scheduler{}
-			if err := yaml.Unmarshal(f.Data, &schedulerConfig); err != nil {
-				return fmt.Errorf("unable to decode the scheduler manifest: %w", err)
-			}
-			mastersSchedulable = schedulerConfig.Spec.MastersSchedulable
-			break
-		}
-	}
-
 	if err := preprovision.TagVIPPorts(ctx, installConfig, infraID); err != nil {
-		return err
+		return fmt.Errorf("failed to tag VIP ports: %w", err)
 	}
 
 	// upload the corresponding image to Glance if rhcosImage contains a
 	// URL. If rhcosImage contains a name, then that points to an existing
 	// Glance image.
 	if imageName, isURL := rhcos.GenerateOpenStackImageName(rhcosImage, infraID); isURL {
 		if err := preprovision.UploadBaseImage(ctx, installConfig.Config.Platform.OpenStack.Cloud, rhcosImage, imageName, infraID, installConfig.Config.Platform.OpenStack.ClusterOSImageProperties); err != nil {
-			return err
+			return fmt.Errorf("failed to upload the RHCOS base image: %w", err)
+		}
+	}
+
+	{
+		var mastersSchedulable bool
+		for _, f := range manifestsAsset.Files() {
+			if f.Filename == manifests.SchedulerCfgFilename {
+				schedulerConfig := configv1.Scheduler{}
+				if err := yaml.Unmarshal(f.Data, &schedulerConfig); err != nil {
+					return fmt.Errorf("unable to decode the scheduler manifest: %w", err)
+				}
+				mastersSchedulable = schedulerConfig.Spec.MastersSchedulable
+				break
+			}
+		}
+		if err := preprovision.SecurityGroups(ctx, installConfig, infraID, mastersSchedulable); err != nil {
+			return fmt.Errorf("failed to create security groups: %w", err)
 		}
 	}
 
-	return preprovision.SecurityGroups(ctx, installConfig, infraID, mastersSchedulable)
+	return nil
 }
 
 var _ clusterapi.InfraReadyProvider = Provider{}

pkg/infrastructure/openstack/preprovision/rhcosimage.go

@@ -76,7 +76,7 @@ func UploadBaseImage(ctx context.Context, cloud string, rhcosImage string, image
 	if res.Err != nil {
 		return err
 	}
-	logrus.Debugf("The data was uploaded.")
+	logrus.Debugf("RHCOS image upload completed.")
 
 	return nil
 }

pkg/infrastructure/openstack/preprovision/securitygroups.go

@@ -81,6 +81,7 @@ func SecurityGroups(ctx context.Context, installConfig *installconfig.InstallCon
 		}
 	}
 
+	logrus.Debugf("Creating the security group rules")
 	var (
 		machineV4CIDRs = make([]string, 0, len(installConfig.Config.Networking.MachineNetwork))
 		machineV6CIDRs = make([]string, 0, len(installConfig.Config.Networking.MachineNetwork))
@@ -211,7 +212,6 @@ func SecurityGroups(ctx context.Context, installConfig *installconfig.InstallCon
 		addRules(ctx, r, workerGroup.ID, serviceIKENat, rules.EtherType4, machineV4CIDRs)
 	}()
 
-	logrus.Debugf("Creating the security group rules")
 	for ruleCreateOpts := range r {
 		if _, err := rules.Create(networkClient, ruleCreateOpts).Extract(); err != nil {
 			return fmt.Errorf("failed to create the security group rule on group %q for %s %s on ports %d-%d: %w", ruleCreateOpts.SecGroupID, ruleCreateOpts.EtherType, ruleCreateOpts.Protocol, ruleCreateOpts.PortRangeMin, ruleCreateOpts.PortRangeMax, err)