Allows to create empty VM #484

vbauzys · 2020-04-01T13:43:55Z

Ref: https://github.com/terraform-providers/terraform-provider-vcd/issues/85
Depends on: vmware/go-vcloud-director#296

This allows users to create VM without template.

Made existing template_name/catalog_name optional
Additionally empty VM allows use/update description
New fields added boot_image, hardware_version, os_type
Power off on delete handling improved

Signed-off-by: Vaidotas Bauzys <[email protected]>

…vider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # go.sum # vcd/resource_vcd_vapp_vm.go # vendor/modules.txt

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md # go.sum # vendor/modules.txt

Signed-off-by: Vaidotas Bauzys <[email protected]>

…provider-vcd into create-empty-vm Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius

Before I forget I must ask to update the message in "index" page:
NOTE: Version 2.8 does not support NSX-T yet. -> NOTE: Version 2.9 does not support NSX-T yet.

One more thought about real life example and wondering if it works well. Imagine - I create a VM and specify a boot image. At the same time it needs to have some disks defined, but disk definition occurs after I have created a VM and specified boot media already. There is some sort of chicken and egg problem.

resource "vcd_vapp" "empty" {
    name = "testing-empty-vm"
}

resource "vcd_vapp_vm" "emptyVM" {
  vapp_name     = vcd_vapp.empty.name
  name          = "VmWithoutTemplate"
  computer_name = "empty-computer"
  memory        = 2048
  cpus          = 2
  cpu_cores     = 1

  os_type          = "sles10_64Guest"
  hardware_version = "vmx-14"
  boot_image       = "dsl-4.11.rc2.iso"

}


resource "vcd_vm_internal_disk" "disk1" {
  vapp_name       = vcd_vapp.empty.name
  vm_name         = vcd_vapp_vm.emptyVM.name
  bus_type        = "sata"
  size_in_mb      = "13333"
  bus_number      = 0
  unit_number     = 0
  storage_profile = "Development"
  allow_vm_reboot = true
}

website/docs/r/vapp_vm.html.markdown

vcd/resource_vcd_vapp_vm.go

vbauzys · 2020-04-24T08:24:39Z

Before I forget I must ask to update the message in "index" page:
NOTE: Version 2.8 does not support NSX-T yet. -> NOTE: Version 2.9 does not support NSX-T yet.

One more thought about real life example and wondering if it works well. Imagine - I create a VM and specify a boot image. At the same time it needs to have some disks defined, but disk definition occurs after I have created a VM and specified boot media already. There is some sort of chicken and egg problem.

resource "vcd_vapp" "empty" {
    name = "testing-empty-vm"
}

resource "vcd_vapp_vm" "emptyVM" {
  vapp_name     = vcd_vapp.empty.name
  name          = "VmWithoutTemplate"
  computer_name = "empty-computer"
  memory        = 2048
  cpus          = 2
  cpu_cores     = 1

  os_type          = "sles10_64Guest"
  hardware_version = "vmx-14"
  boot_image       = "dsl-4.11.rc2.iso"

}


resource "vcd_vm_internal_disk" "disk1" {
  vapp_name       = vcd_vapp.empty.name
  vm_name         = vcd_vapp_vm.emptyVM.name
  bus_type        = "sata"
  size_in_mb      = "13333"
  bus_number      = 0
  unit_number     = 0
  storage_profile = "Development"
  allow_vm_reboot = true
}

Well we can't manage disks in VM resource. Overall it's not 100% nice, but boot image is mounted to cd-rom. You can handle VM with power_on when you assing internal disk.

Didainius · 2020-04-24T12:07:46Z

Well we can't manage disks in VM resource. Overall it's not 100% nice, but boot image is mounted to cd-rom. You can handle VM with power_on when you assing internal disk.

I was able to install ubuntu semi-manually. Of course it is based on the fact that installer took some time and did not scan for disks until the actual disk was added. Other way to work on it is to setup the scene with power_on=false as you mentioned.

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas · 2020-04-27T11:37:09Z

website/docs/r/vapp_vm.html.markdown

@@ -197,8 +216,8 @@ The following arguments are supported:
 * `vapp_name` - (Required) The vApp this VM belongs to.
 * `name` - (Required) A name for the VM, unique within the vApp 
 * `computer_name` - (Optional; *v2.5+*) Computer name to assign to this virtual machine. 
-* `catalog_name` - (Required) The catalog name in which to find the given vApp Template
-* `template_name` - (Required) The name of the vApp Template to use
+* `catalog_name` - (Optional; *v2.8+*) The catalog name in which to find the given vApp Template


2.8 should be repaced to 2.9 across this PR.

website/docs/r/vapp_vm.html.markdown

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius

I have tested the following:
vCD 10.1: upgrade, binary, acceptance
vCD 9.7: acceptance and org user acceptance tests
vcd 10.0: acceptance .

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas

Really useful feature when you use it together with the new boot_image field, LGTM now!

dataclouder

I have some important questions and a few minor changes.

dataclouder · 2020-04-27T19:54:58Z

vcd/resource_vcd_vapp_emtpy_vm_test.go

+	)
+
+	if testConfig.Media.MediaName == "" {
+		fmt.Print("Warning: `MediaName` isn't configured, boot image won't be tested.")


Suggested change

fmt.Print("Warning: `MediaName` isn't configured, boot image won't be tested.")

fmt.Println("Warning: `MediaName` is not configured: boot image won't be tested.")

dataclouder · 2020-04-27T20:00:19Z

vcd/resource_vcd_vapp_vm.go

-	}
+		catalog, err := org.GetCatalogByName(catalogName, false)
+		if err != nil {
+			return fmt.Errorf("error finding catalog %s: %s", d.Get("catalog_name").(string), err)


Suggested change

return fmt.Errorf("error finding catalog %s: %s", d.Get("catalog_name").(string), err)

return fmt.Errorf("error finding catalog %s: %s", catalogName, err)

dataclouder · 2020-04-27T20:01:15Z

vcd/resource_vcd_vapp_vm.go

 		if err != nil {
-			return fmt.Errorf("[vm creation] error retrieving storage profile %s : %s", storageProfileName, err)
+			return fmt.Errorf("error finding catalog item: %s", err)


Suggested change

return fmt.Errorf("error finding catalog item: %s", err)

return fmt.Errorf("error finding catalog item %s: %s", templateName, err)

dataclouder · 2020-04-27T20:11:06Z

website/docs/r/vapp_vm.html.markdown

@@ -188,6 +188,25 @@ resource "vcd_nsxv_ip_set" "test-ipset" {
 }
 ```

+## Example Usage (Empty VM)
+This example shows how to create empty VM.


Suggested change

This example shows how to create empty VM.

This example shows how to create an empty VM.

dataclouder · 2020-04-27T20:16:10Z

vcd/resource_vcd_vapp_vm.go

+				return fmt.Errorf("[VM update] error quering boot image %s : %s", previousBootImageValue, err)
+			}
+			if len(result) > 1 {
+				return fmt.Errorf("[VM update] error found one than more boot image %s : %s", previousBootImageValue, err)


Suggested change

return fmt.Errorf("[VM update] error found one than more boot image %s : %s", previousBootImageValue, err)

return fmt.Errorf("[VM update] error found more than one boot image %s", previousBootImageValue)

The error is nil and should not be shown here

dataclouder · 2020-04-27T20:22:00Z

website/docs/r/vapp_vm.html.markdown

-
+* `os_type` - (Optional; *v2.9+*) Operating System type. Possible values can be found in [Os Types](#os-types). Required when creating empty VM.
+* `hardware_version` - (Optional; *v2.9+*) Virtual Hardware Version (e.g.`vmx-14`, `vmx-13`, `vmx-12`, etc.). Required when creating empty VM.
+* `boot_image` - (Optional; *v2.9+*) Media name to mount as boot image which can be found in any accessible catalog. Image is mounted only during VM creation. On update if value is changed to empty it will eject the mounted media. If you want to mount an image later, please use [vcd_inserted_media](/docs/providers/vcd/r/inserted_media.html).  


I have a question about this:
If I have two boot images with the same name in two different catalogs, the query will return two items, and the creation will fail. How do I say that I want the image from catalog 1 to be used in this case? In other words, how do I avoid the error that I would not have for the vApp template, which must belong to a specific catalog? It seems to me that we have introduced a behavior inconsistency.

As we agreed, add catalog name handling together with boot image.

dataclouder · 2020-04-28T04:34:13Z

vcd/resource_vcd_vapp_vm.go

+			return nil, fmt.Errorf("[VM creation] error getting boot image %s : %s", bootImageName, err)
+		}
+		if len(result) > 1 {
+			return nil, fmt.Errorf("[VM creation] error found more than one boot image %s : %s", bootImageName, err)


the error is nil and should not be shown here.

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder

LGTM

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys added 30 commits July 15, 2019 15:39

Add missing file

6585559

Signed-off-by: Vaidotas Bauzys <[email protected]>

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

e247d25

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

cf1e7c2

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

be6790f

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

6f4c5cb

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

c73d402

…vider-vcd

git push origin master

261d142

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

c431d43

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

414b3bf

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

8b03ab8

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

36c5487

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

db01eec

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

331e895

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

a85d555

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

e1996e3

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

9c63eec

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

5073f6c

…roviders/terraform-provider-vcd

git push origin master

f0bdef3

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

24f169d

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

06b36d1

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

30d6a79

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

0ca001f

…roviders/terraform-provider-vcd

git push origin master

8c9c7c4

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

4c8d081

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

206bc9f

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

48970bc

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

e7ef092

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

cb5659a

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

1e097fd

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

ae2d955

…roviders/terraform-provider-vcd

vbauzys and others added 8 commits April 16, 2020 08:10

Merge branch 'master' into create-empty-vm

4ffa184

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # go.sum # vcd/resource_vcd_vapp_vm.go # vendor/modules.txt

Merge branch 'master' into create-empty-vm

b60bbe6

git push origin master

38dee11

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin master

2741612

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

Merge branch 'master' into create-empty-vm

4b628a5

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md # go.sum # vendor/modules.txt

bump latest govcd

8382b09

Signed-off-by: Vaidotas Bauzys <[email protected]>

Merge branch 'create-empty-vm' of github.com:vbauzysvmware/terraform-…

9a7dac6

…provider-vcd into create-empty-vm Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md

Improve tests after bug fix

c512f17

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius reviewed Apr 24, 2020

View reviewed changes

website/docs/r/vapp_vm.html.markdown Show resolved Hide resolved

vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved

vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved

vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved

Improvements

f6abf41

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys mentioned this pull request Apr 24, 2020

Allow to create VM without template #85

Closed

lvirbalas requested changes Apr 27, 2020

View reviewed changes

Improve docs

5f91071

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius approved these changes Apr 27, 2020

View reviewed changes

vbauzys added 2 commits April 27, 2020 17:08

Improve docs

d603864

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve docs

3e94276

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas approved these changes Apr 27, 2020

View reviewed changes

dataclouder suggested changes Apr 27, 2020

View reviewed changes

dataclouder reviewed Apr 28, 2020

View reviewed changes

vbauzys added 6 commits April 28, 2020 10:42

Improvements

04e8dda

Signed-off-by: Vaidotas Bauzys <[email protected]>

Added catalog handling for boot image.

64e144e

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve docs

93fdeae

Signed-off-by: Vaidotas Bauzys <[email protected]>

Added catalog handling for boot image when updating

725795c

Signed-off-by: Vaidotas Bauzys <[email protected]>

Removed double error handling.

b0fd8d2

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve docs

61cc0e0

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder approved these changes Apr 28, 2020

View reviewed changes

bump govcd

065686f

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys merged commit 8cad64f into vmware:master Apr 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allows to create empty VM #484

Allows to create empty VM #484

vbauzys commented Apr 1, 2020 •

edited

Loading

Didainius left a comment

vbauzys commented Apr 24, 2020

Didainius commented Apr 24, 2020

lvirbalas Apr 27, 2020

vbauzys Apr 27, 2020

Didainius left a comment

lvirbalas left a comment

dataclouder left a comment

dataclouder Apr 27, 2020

vbauzys Apr 28, 2020

dataclouder Apr 27, 2020

vbauzys Apr 28, 2020

dataclouder Apr 27, 2020

vbauzys Apr 28, 2020

dataclouder Apr 27, 2020

vbauzys Apr 28, 2020

dataclouder Apr 27, 2020 •

edited

Loading

vbauzys Apr 28, 2020

dataclouder Apr 27, 2020

vbauzys Apr 28, 2020

dataclouder Apr 28, 2020

vbauzys Apr 28, 2020

dataclouder left a comment

	fmt.Print("Warning: `MediaName` isn't configured, boot image won't be tested.")
	fmt.Println("Warning: `MediaName` is not configured: boot image won't be tested.")

	return fmt.Errorf("error finding catalog %s: %s", d.Get("catalog_name").(string), err)
	return fmt.Errorf("error finding catalog %s: %s", catalogName, err)

	This example shows how to create empty VM.
	This example shows how to create an empty VM.

	return fmt.Errorf("[VM update] error found one than more boot image %s : %s", previousBootImageValue, err)
	return fmt.Errorf("[VM update] error found more than one boot image %s", previousBootImageValue)

Allows to create empty VM #484

Allows to create empty VM #484

Conversation

vbauzys commented Apr 1, 2020 • edited Loading

Didainius left a comment

Choose a reason for hiding this comment

vbauzys commented Apr 24, 2020

Didainius commented Apr 24, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Didainius left a comment

Choose a reason for hiding this comment

lvirbalas left a comment

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dataclouder Apr 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

vbauzys commented Apr 1, 2020 •

edited

Loading

dataclouder Apr 27, 2020 •

edited

Loading