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

…4474-to-release-4.6 Bug 1913813: OpenStack: Skip collecting info for empty subnet IDs
openshift · Jan 22, 2021 · 26aab99 · 26aab99
2 parents a8eaa59 + 00bf070
commit 26aab99
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/asset/installconfig/openstack/validation/cloudinfo.go b/pkg/asset/installconfig/openstack/validation/cloudinfo.go
@@ -134,6 +134,9 @@ func (ci *CloudInfo) collectInfo(ic *types.InstallConfig) error {
 }
 
 func (ci *CloudInfo) getSubnet(subnetID string) (*subnets.Subnet, error) {
+	if subnetID == "" {
+		return nil, nil
+	}
 	subnet, err := subnets.Get(ci.clients.networkClient, subnetID).Extract()
 	if err != nil {
 		var gerr *gophercloud.ErrResourceNotFound