Merge pull request #6 from danhiris/main

Fix issue 4 and 5. Remove netplan

Author: TheMattSchiller

main.tf

@@ -125,8 +125,7 @@ resource "google_compute_instance_template" "accesstier_template" {
     "echo '65536' > /proc/sys/net/netfilter/nf_conntrack_buckets \n",
     "echo '262144' > /proc/sys/net/netfilter/nf_conntrack_max \n",
     var.datadog_api_key != null ? "curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh | DD_AGENT_MAJOR_VERSION=7 DD_API_KEY=${var.datadog_api_key} DD_SITE=datadoghq.com bash -v \n" : "",
-    "netplan set ethernets.ens4.addresses=[${google_compute_address.external.address}/32] && netplan apply\n", // needed for direct server response, lb doesn't change ip address to the vm's so netagent ignores it
-    "for i in {1..3}; do curl https://www.banyanops.com/onramp/deb-repo/banyan.key | apt-key add - && break || sleep 3; done \n",
+    "curl https://www.banyanops.com/onramp/deb-repo/banyan.key | apt-key add -\n",
     var.staging_repo != null ? "apt-add-repository \"deb https://www-stage.bnntest.com/onramp/deb-repo xenial main\" \n" : "apt-add-repository \"deb https://www.banyanops.com/onramp/deb-repo xenial main\" \n",
     var.netagent_version != null ? "apt-get update && apt-get install -y banyan-netagent2=${var.netagent_version} \n" : "apt-get update && apt-get install -y banyan-netagent2 \n",
     "cd /opt/banyan-packages \n",

variables.tf

@@ -42,7 +42,7 @@ variable "enable_hsts" {
 
 variable "netagent_version" {
   type        = string
-  description = "Override to use a specific version of netagent (e.g. `1.49.1`). Omit for the latest version available"
+  description = "Override to use a specific version of netagent (e.g. `v2.2.0`). Omit for the latest version available. This version of the provider requires netagent v2.2.0 or higher"
   default     = null
 }