data/data/install.openshift.io_installconfigs.yaml: Added resourcePool

New resourcePool install-config option needs to be present in schema for install.openshift.io/InstallConfig
openshift · Nov 15, 2021 · aca54e3 · aca54e3
1 parent 1c3338e
commit aca54e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml
@@ -2160,6 +2160,11 @@ spec:
                     description: Password is the password for the user to use to connect
                       to the vCenter.
                     type: string
+                  resourcePool:
+                    description: ResourcePool is the absolute path of the resource
+                      pool where virtual machines will be created. The absolute path
+                      is of the form /<datacenter>/host/<cluster>/Resources/<resourcepool>.
+                    type: string
                   username:
                     description: Username is the name of the user to use to connect
                       to the vCenter.

diff --git a/pkg/terraform/exec/plugins/vsphereprivate/resource_vsphereprivate_import_ova.go b/pkg/terraform/exec/plugins/vsphereprivate/resource_vsphereprivate_import_ova.go
@@ -276,16 +276,7 @@ func findImportOvaParams(client *vim25.Client, datacenter, cluster, resourcePool
 		}
 
 		if foundDatastore && foundNetwork {
-<<<<<<< HEAD
-			importOvaParams.Host = hostObj
-			resourcePool, err := hostObj.ResourcePool(ctx)
-			if err != nil {
-				return nil, err
-			}
-			importOvaParams.ResourcePool = resourcePool
-=======
 			return importOvaParams, nil
->>>>>>> fe685880f (vsphereprivate_import_ova: Support resource pool)
 		}
 	}