Skip flavor configuration on error

Return error only if none of the flavors could
be configured.

controllers/amphoracontroller_controller.go

@@ -265,7 +265,7 @@ func (r *OctaviaAmphoraControllerReconciler) reconcileNormal(ctx context.Context
 
 	defaultFlavorID, err := amphoracontrollers.EnsureFlavors(ctx, instance, &r.Log, helper)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{RequeueAfter: time.Duration(180) * time.Second}, nil
 	}
 	r.Log.Info(fmt.Sprintf("Using default flavor \"%s\"", defaultFlavorID))
 

pkg/amphoracontrollers/flavors.go

@@ -220,10 +220,8 @@ func ensureFlavors(osclient *openstack.OpenStack, log *logr.Logger, instance *oc
 				ComputeFlavorID: amphoraFlavors[flavorOpts.Name].ID,
 			}
 
-			if amphoraFlavors[flavorOpts.Name].VCPUs == 1 {
-				flavorProfileData.AmpImageTag = octavia.AmphoraImageTag
-			} else {
-				flavorProfileData.AmpImageTag = octavia.AmphoraImageVertTag
+			if amphoraFlavors[flavorOpts.Name].VCPUs > 1 {
+			flavorProfileData.AmpImageTag = octavia.AmphoraImageVertTag
 			}
 
 			fpDataJSON, err := json.Marshal(flavorProfileData)
@@ -239,8 +237,8 @@ func ensureFlavors(osclient *openstack.OpenStack, log *logr.Logger, instance *oc
 			log.Info(fmt.Sprintf("Creating Octavia flavor profile \"%s\"", flavorProfileCreateOpts.Name))
 			fp, err := flavorprofiles.Create(lbClient, flavorProfileCreateOpts).Extract()
 			if err != nil {
-				errFmt := fmt.Errorf("error creating flavor profile: %w", err)
-				log.Error(errFmt, fmt.Sprintf("Amphora image might be missing or not "+
+				log.Info(fmt.Sprintf("Warning: Could not create flavor profile. "+
+					"Amphora image might be missing or not "+
 					"tagged correctly. Skipping configuration of octavia "+
 					"flavor profile %s and octavia flavor %s.",
 					flavorProfileCreateOpts.Name, name))
@@ -266,7 +264,7 @@ func ensureFlavors(osclient *openstack.OpenStack, log *logr.Logger, instance *oc
 		flavorSuccess = true
 	}
 	if !flavorSuccess {
-		return "", fmt.Errorf("none of the Octavia flavors could be configured because of errors. last error: %w", err)
+		return "", fmt.Errorf("none of the Octavia flavors could be configured")
 	}
 	return defaultFlavorID, nil
 }