Merge remote-tracking branch 'upstream/master' into feature/cpu

This commit is contained in:
Virgil 2019-08-14 18:24:21 +02:00
commit a8af234608

View File

@ -55,16 +55,16 @@ func Provider() *schema.Provider {
Default: false, Default: false,
}, },
"pm_otp": { "pm_otp": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Optional: true,
DefaultFunc: schema.EnvDefaultFunc("PM_OTP", nil), DefaultFunc: schema.EnvDefaultFunc("PM_OTP", ""),
Description: "OTP 2FA code (if required)", Description: "OTP 2FA code (if required)",
}, },
}, },
ResourcesMap: map[string]*schema.Resource{ ResourcesMap: map[string]*schema.Resource{
"proxmox_vm_qemu": resourceVmQemu(), "proxmox_vm_qemu": resourceVmQemu(),
"proxmox_lxc": resourceLxc(), "proxmox_lxc": resourceLxc(),
// TODO - storage_iso // TODO - storage_iso
// TODO - bridge // TODO - bridge
// TODO - vm_qemu_template // TODO - vm_qemu_template