mirror of
https://github.com/letic/terraform-provider-proxmox.git
synced 2024-10-05 02:01:04 +00:00
Fix conflicts from branch 'upstream/master' into multi_device
This commit is contained in:
commit
290e8471ce
27
docs/terraforminit.md
Normal file
27
docs/terraforminit.md
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# How to get terraform to recognize third party provider
|
||||||
|
|
||||||
|
The default installation of terraform has no way of finding custom third party providers. This document shows you how to locate providers so that `terraform init` can find them and copy them to your working terraform directory when creating a new project.
|
||||||
|
|
||||||
|
## Locate the provider binaries
|
||||||
|
|
||||||
|
Assuming you have followed other directions the deafult locations for these binaries (on a mac at least) are as follows:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
which terraform-provider-proxmox
|
||||||
|
~/go-workspace/bin/terraform-provider-proxmox
|
||||||
|
which terraform-provisioner-proxmox
|
||||||
|
~/go-workspace/bin/terraform-provisioner-proxmox
|
||||||
|
```
|
||||||
|
|
||||||
|
## Copy provider binaries
|
||||||
|
|
||||||
|
You need to copy these binaries to the ~/.terraform.d directory which will also need to have a plugins directory created:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cd ~/.terraform.d
|
||||||
|
mkdir plugins
|
||||||
|
cd plugins
|
||||||
|
cp ~/go-workspace/bin/terraform-provider-proxmox .
|
||||||
|
cp ~/go-workspace/bin/terraform-provisioner-proxmox .
|
||||||
|
```
|
||||||
|
Once this is done, simply create a new terraform directory and do usual terraforming (terraform init etc)
|
@ -337,7 +337,6 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
|
|||||||
qemuNetworks := devicesSetToMap(networks)
|
qemuNetworks := devicesSetToMap(networks)
|
||||||
disks := d.Get("disk").(*schema.Set)
|
disks := d.Get("disk").(*schema.Set)
|
||||||
qemuDisks := devicesSetToMap(disks)
|
qemuDisks := devicesSetToMap(disks)
|
||||||
diskGB := d.Get("disk_gb").(float64)
|
|
||||||
|
|
||||||
config := pxapi.ConfigQemu{
|
config := pxapi.ConfigQemu{
|
||||||
Name: vmName,
|
Name: vmName,
|
||||||
@ -359,7 +358,7 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
|
|||||||
Ipconfig1: d.Get("ipconfig1").(string),
|
Ipconfig1: d.Get("ipconfig1").(string),
|
||||||
// Deprecated single disk config.
|
// Deprecated single disk config.
|
||||||
Storage: d.Get("storage").(string),
|
Storage: d.Get("storage").(string),
|
||||||
DiskSize: diskGB,
|
DiskSize: d.Get("disk_gb").(float64),
|
||||||
// Deprecated single nic config.
|
// Deprecated single nic config.
|
||||||
QemuNicModel: d.Get("nic").(string),
|
QemuNicModel: d.Get("nic").(string),
|
||||||
QemuBrige: d.Get("bridge").(string),
|
QemuBrige: d.Get("bridge").(string),
|
||||||
@ -475,7 +474,6 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error {
|
|||||||
qemuDisks := devicesSetToMap(configDisksSet)
|
qemuDisks := devicesSetToMap(configDisksSet)
|
||||||
configNetworksSet := d.Get("network").(*schema.Set)
|
configNetworksSet := d.Get("network").(*schema.Set)
|
||||||
qemuNetworks := devicesSetToMap(configNetworksSet)
|
qemuNetworks := devicesSetToMap(configNetworksSet)
|
||||||
diskGB := d.Get("disk_gb").(float64)
|
|
||||||
|
|
||||||
config := pxapi.ConfigQemu{
|
config := pxapi.ConfigQemu{
|
||||||
Name: vmName,
|
Name: vmName,
|
||||||
@ -497,7 +495,7 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error {
|
|||||||
Ipconfig1: d.Get("ipconfig1").(string),
|
Ipconfig1: d.Get("ipconfig1").(string),
|
||||||
// Deprecated single disk config.
|
// Deprecated single disk config.
|
||||||
Storage: d.Get("storage").(string),
|
Storage: d.Get("storage").(string),
|
||||||
DiskSize: diskGB,
|
DiskSize: d.Get("disk_gb").(float64),
|
||||||
// Deprecated single nic config.
|
// Deprecated single nic config.
|
||||||
QemuNicModel: d.Get("nic").(string),
|
QemuNicModel: d.Get("nic").(string),
|
||||||
QemuBrige: d.Get("bridge").(string),
|
QemuBrige: d.Get("bridge").(string),
|
||||||
@ -791,6 +789,5 @@ func preprovision(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user