Merge pull request #5602 from openshift-cherrypick-robot/cherry-pick-…

…5601-to-release-4.10

[release-4.10] Bug 2050227: Don't shortcut OpenStack scraping if quota is unavailable

pkg/asset/installconfig/openstack/validation/cloudinfo.go

@@ -211,13 +211,11 @@ func (ci *CloudInfo) collectInfo(ic *types.InstallConfig, opts *clientconfig.Cli
 	if err != nil {
 		if isUnauthorized(err) {
 			logrus.Warnf("Missing permissions to fetch Quotas and therefore will skip checking them: %v", err)
-			return nil
-		}
-		if isNotFoundError(err) {
+		} else if isNotFoundError(err) {
 			logrus.Warnf("Quota API is not available and therefore will skip checking them: %v", err)
-			return nil
+		} else {
+			return errors.Wrap(err, "failed to load Quota")
 		}
-		return errors.Wrap(err, "failed to load Quota")
 	}
 
 	ci.NetworkExtensions, err = networkextensions.Get(ci.clients.networkClient)