Merge pull request #423 from wearespindle/master

ggongaware · web-flow · commit cd9e5a489633 · 2021-10-22T10:22:16.000-07:00
Add HA Group option to schema &amp; docs
diff --git a/docs/resources/lxc.md b/docs/resources/lxc.md
@@ -174,6 +174,7 @@ The following arguments may be optionally defined when using this resource:
 * `force` - A boolean that allows the overwriting of pre-existing containers.
 * `full` - When cloning, create a full copy of all disks. This is always done when you clone a normal CT. For CT template it creates a linked clone by default.
 * `hastate` - Requested HA state for the resource. One of "started", "stopped", "enabled", "disabled", or "ignored". See the [docs about HA](https://pve.proxmox.com/pve-docs/chapter-ha-manager.html#ha_manager_resource_config) for more info.
+* `hagroup` - The HA group identifier the resource belongs to (requires `hastate` to be set!). See the [docs about HA](https://pve.proxmox.com/pve-docs/chapter-ha-manager.html#ha_manager_resource_config) for more info.
 * `hookscript` - A string containing [a volume identifier to a script](https://pve.proxmox.com/pve-docs/pve-admin-guide.html#_hookscripts_2) that will be executed during various steps throughout the container's lifetime. The script must be an executable file.
 * `hostname` - Specifies the host name of the container.
 * `ignore_unpack_errors` - A boolean that determines if template extraction errors are ignored during container creation.
diff --git a/docs/resources/vm_qemu.md b/docs/resources/vm_qemu.md
@@ -95,6 +95,7 @@ The following arguments are supported in the top level resource block.
 | `clone`                       | `str`  |                      | The base VM from which to clone to create the new VM.                                                                                                                                                                                                                                                                       |
 | `full_clone`                  | `bool` | `true`               | Set to `true` to create a full clone, or `false` to create a linked clone. See the [docs about cloning](https://pve.proxmox.com/pve-docs/chapter-qm.html#qm_copy_and_clone) for more info. Only applies when `clone` is set.                                                                                                |
 | `hastate`                     | `str`  |                      | Requested HA state for the resource. One of "started", "stopped", "enabled", "disabled", or "ignored". See the [docs about HA](https://pve.proxmox.com/pve-docs/chapter-ha-manager.html#ha_manager_resource_config) for more info.                                                                                          |
+| `hagroup`                     | `str`  |                      | The HA group identifier the resource belongs to (requires `hastate` to be set!). See the [docs about HA](https://pve.proxmox.com/pve-docs/chapter-ha-manager.html#ha_manager_resource_config) for more info.|
 | `qemu_os`                     | `str`  | `"l26"`              | The type of OS in the guest. Set properly to allow Proxmox to enable optimizations for the appropriate guest OS. It takes the value from the source template and ignore any changes to resource configuration parameter.                                                                                                    |
 | `memory`                      | `int`  | `512`                | The amount of memory to allocate to the VM in Megabytes.                                                                                                                                                                                                                                                                    |
 | `balloon`                     | `int`  | `0`                  | The minimum amount of memory to allocate to the VM in Megabytes, when Automatic Memory Allocation is desired. Proxmox will enable a balloon device on the guest to manage dynamic allocation. See the [docs about memory](https://pve.proxmox.com/pve-docs/chapter-qm.html#qm_memory) for more info.                        |
diff --git a/proxmox/resource_lxc.go b/proxmox/resource_lxc.go
@@ -113,6 +113,10 @@ func resourceLxc() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"hagroup": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"hookscript": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -430,6 +434,7 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
 	config.Force = d.Get("force").(bool)
 	config.Full = d.Get("full").(bool)
 	config.HaState = d.Get("hastate").(string)
+	config.HaGroup = d.Get("hagroup").(string)
 	config.Hookscript = d.Get("hookscript").(string)
 	config.Hostname = d.Get("hostname").(string)
 	config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool)
@@ -578,6 +583,7 @@ func resourceLxcUpdate(d *schema.ResourceData, meta interface{}) error {
 	}
 	config.Force = d.Get("force").(bool)
 	config.HaState = d.Get("hastate").(string)
+	config.HaGroup = d.Get("hagroup").(string)
 	config.Hookscript = d.Get("hookscript").(string)
 	config.Hostname = d.Get("hostname").(string)
 	config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool)
@@ -769,6 +775,7 @@ func _resourceLxcRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("description", config.Description)
 	d.Set("force", config.Force)
 	d.Set("hastate", vmr.HaState)
+	d.Set("hagroup", vmr.HaGroup)
 	d.Set("hookscript", config.Hookscript)
 	d.Set("hostname", config.Hostname)
 	d.Set("ignore_unpack_errors", config.IgnoreUnpackErrors)
diff --git a/proxmox/resource_vm_qemu.go b/proxmox/resource_vm_qemu.go
@@ -116,6 +116,10 @@ func resourceVmQemu() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"hagroup": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"qemu_os": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -684,6 +688,7 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
 		Hotplug:      d.Get("hotplug").(string),
 		Scsihw:       d.Get("scsihw").(string),
 		HaState:      d.Get("hastate").(string),
+		HaGroup:      d.Get("hagroup").(string),
 		QemuOs:       d.Get("qemu_os").(string),
 		Tags:         d.Get("tags").(string),
 		Args:         d.Get("args").(string),
@@ -968,6 +973,7 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error {
 		Hotplug:      d.Get("hotplug").(string),
 		Scsihw:       d.Get("scsihw").(string),
 		HaState:      d.Get("hastate").(string),
+		HaGroup:      d.Get("hagroup").(string),
 		QemuOs:       d.Get("qemu_os").(string),
 		Tags:         d.Get("tags").(string),
 		Args:         d.Get("args").(string),
@@ -1229,6 +1235,7 @@ func _resourceVmQemuRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("hotplug", config.Hotplug)
 	d.Set("scsihw", config.Scsihw)
 	d.Set("hastate", vmr.HaState())
+	d.Set("hagroup", vmr.HaGroup())
 	d.Set("qemu_os", config.QemuOs)
 	d.Set("tags", config.Tags)
 	d.Set("args", config.Args)
