Merge pull request #7 in TER/terraform-vcloud-linuxvm from ~JFROCHE/terraform-vcloud-linuxvm:feat/multiple-nics to master

* commit 'b8cf54ec6aa3cacec3aa1c247509763162e236c7':
  Update changelog
  feat: connect vm to multiple networ

Author: ROCHE Jean Francois

CHANGELOG.md

@@ -1,6 +1,12 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
+### Ci
+- add linter
+
+### Feat
+- connect vm to multiple networks
+
 
 <a name="v1.0.0"></a>
 ## [v1.0.0] - 2021-03-15

README.md

@@ -27,10 +27,9 @@
 | hostname\_index | VM unique ID | `number` | `1` | no |
 | hostname\_type | Server type (refer to 'Server naming convention v7.0) | `string` | `"application"` | no |
 | instance | Puppet/Ansible instance of the machine (refer to http://docs.cicd.cirb.lan/puppet/overview.html#_5_essential_machine_code_facts_code for more information) | `string` | `""` | no |
-| ip | Set a static ip address to the vm. | `string` | `""` | no |
 | memory | The amount of RAM (in MB) to allocate to the VM | `number` | `1024` | no |
 | metadata | A hash containing the vm metadata | `map` | `{}` | no |
-| network | Name of the network to use for this VM | `string` | n/a | yes |
+| nics | VM Network Interfaces | <pre>list(object({<br>    network = string<br>    ip      = string<br>    primary = bool<br>  }))</pre> | n/a | yes |
 | post\_script | Script to run at the end of the initial boot | `string` | `""` | no |
 | power\_on | A boolean value stating if this VM should be powered on | `bool` | `true` | no |
 | pre\_script | Script to run at the beginning of the initial boot | `string` | `""` | no |

examples/basic/vm.tf

@@ -1,10 +1,28 @@
+resource "vcd_vapp" "terraform_dev" {
+  name     = "terraform-dev"
+  power_on = true
+}
+
+data "vcd_network_direct" "ci" {
+  name = "CI-IMZ-DEV"
+}
+
+resource "vcd_vapp_org_network" "direct-network-ci" {
+  vapp_name        = vcd_vapp.terraform_dev.name
+  org_network_name = data.vcd_network_direct.network-vapp.name
+}
+
 module "basic" {
-  source                   = "../.."
+  source = "../.."
+  vapp   = vcd_vapp.terraform_dev.name
+  nics = [{
+    network = data.vcd_network_direct.ci.name
+    ip      = ""
+    primary = true
+  }]
   zone                     = "dev"
   hostname_app_description = "tf"
   role                     = "testing"
-  network                  = "CD-IMZ-DEV"
-  vapp                     = "puppet"
   hostgroup                = "cicd"
   post_script              = <<EOF
 echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMwb1QEzYKaola6hYvkBelVXOvWYfi62lHMSGO6Zn+kQ cicd_team" >> /root/.ssh/authorized_keys

linux_vm.tf

@@ -65,12 +65,15 @@ resource "vcd_vapp_vm" "vm" {
     instance  = var.instance
   }, var.metadata)
 
-  network {
-    type               = "org"
-    name               = var.network
-    ip_allocation_mode = var.ip != "" ? "MANUAL" : "POOL"
-    ip                 = var.ip
-    is_primary         = true
+  dynamic "network" {
+    for_each = var.nics
+    content {
+      type               = "org"
+      name               = network.value["network"]
+      ip_allocation_mode = network.value["ip"] != "" ? "MANUAL" : "POOL"
+      ip                 = network.value["ip"] != "" ? network.value["ip"] : null
+      is_primary         = network.value["primary"]
+    }
   }
 
   lifecycle {

variables.tf

@@ -83,11 +83,6 @@ variable "extra_disk_size" {
   default     = 0
 }
 
-variable "network" {
-  description = "Name of the network to use for this VM"
-  type        = string
-}
-
 variable "dc" {
   description = "Name of the dc where this VM is running"
   type        = string
@@ -139,8 +134,12 @@ variable "metadata" {
   default     = {}
 }
 
-variable "ip" {
-  description = "Set a static ip address to the vm."
-  type        = string
-  default     = ""
+variable "nics" {
+  type = list(object({
+    network = string
+    ip      = string
+    primary = bool
+  }))
+
+  description = "VM Network Interfaces"
 }