Merge remote-tracking branch 'origin/master' into fix/pool-update

wearespindle · Oct 14, 2019 · a9fcdac · a9fcdac
2 parents 2919c3a + 5326f4e
commit a9fcdac
Show file tree

Hide file tree

Showing 6 changed files with 512 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ dist: xenial
 language: go
 
 go:
-  - 1.12.x
+  - 1.13.x
 
 git:
   depth: 1
@@ -13,12 +13,6 @@ install: true
 notifications:
   email: false
 
-before_script:
-  - go get github.com/Telmate/proxmox-api-go
-  - go install github.com/Telmate/proxmox-api-go
-  - go get github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provider-proxmox
-  - go get github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provisioner-proxmox
-
 script:
   - make
   - make install
diff --git a/examples/lxc_example.tf b/examples/lxc_example.tf
@@ -12,7 +12,6 @@ resource "proxmox_lxc" "lxc-test" {
     }
     hostname = "terraform-new-container"
     network {
-        id = 0
         name = "eth0"
         bridge = "vmbr0"
         ip = "dhcp"

diff --git a/go.mod b/go.mod
@@ -0,0 +1,8 @@
+module github.com/Telmate/terraform-provider-proxmox
+
+go 1.13
+
+require (
+	github.com/Telmate/proxmox-api-go v0.0.0-20191004191441-b316f5294af6
+	github.com/hashicorp/terraform v0.12.10
+)