Merge branch 'spot-instances' of https://github.com/iterative/terraform-provider-iterative into spot-instances

Author: DavidGOrtega

cml/ami.json

@@ -1,47 +1,44 @@
 {
-    "builders" : [
-        {
-            "type" : "amazon-ebs", 
-            "assume_role": {
-                "role_arn": "arn:aws:iam::260760892802:role/dvc-cml-packer",
-                "session_name": "cml-packer-session"
-            },
-            "region" : "us-west-1",
-            "ami_name" : "iterative-cml",
-            "ami_description" : "CML (Continous Machine Learning). Ubuntu 18.04",
-            "ami_groups": ["all"],
-            "force_deregister": "true",
-            "force_delete_snapshot": "true",
-            "ssh_username" : "ubuntu",
-            "instance_type" : "g2.2xlarge",
-            "source_ami_filter": {
-                "filters": {
-                  "virtualization-type": "hvm",
-                  "name": "ubuntu/images/*ubuntu-*-18.04-amd64-server-*",
-                  "root-device-type": "ebs"
-                },
-                "owners": ["099720109477"],
-                "most_recent": true
-            },
-            "run_tags" : {
-                "Author" : "iterative"
-            }
-        }
-    ],
-    "provisioners" : [
-        {
-            "type" : "shell",
-            "environment_vars": ["DEBIAN_FRONTEND=noninteractive"],
-            "script" : "./setup.sh"
+  "builders": [
+    {
+      "type": "amazon-ebs",
+      "assume_role": {
+        "role_arn": "arn:aws:iam::260760892802:role/dvc-cml-packer",
+        "session_name": "cml-packer-session"
+      },
+      "region": "us-west-1",
+      "ami_name": "iterative-cml",
+      "ami_description": "CML (Continous Machine Learning). Ubuntu 18.04",
+      "ami_groups": ["all"],
+      "force_deregister": "true",
+      "force_delete_snapshot": "true",
+      "ssh_username": "ubuntu",
+      "instance_type": "g2.2xlarge",
+      "source_ami_filter": {
+        "filters": {
+          "virtualization-type": "hvm",
+          "name": "ubuntu/images/*ubuntu-*-18.04-amd64-server-*",
+          "root-device-type": "ebs"
         },
-        {
-            "type": "shell",
-            "inline": [
-              "sudo shutdown -r now",
-              "sleep 60"
-            ],
-            "start_retry_timeout": "10m",
-            "expect_disconnect": true
-        }
-    ]
+        "owners": ["099720109477"],
+        "most_recent": true
+      },
+      "run_tags": {
+        "Author": "iterative"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "environment_vars": ["DEBIAN_FRONTEND=noninteractive"],
+      "script": "./setup.sh"
+    },
+    {
+      "type": "shell",
+      "inline": ["sudo shutdown -r now", "sleep 60"],
+      "start_retry_timeout": "10m",
+      "expect_disconnect": true
+    }
+  ]
 }

iterative/resource_runner.go

@@ -242,7 +242,7 @@ export DEBIAN_FRONTEND=noninteractive
 echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assumeyes
 
 sudo apt remove unattended-upgrades
-systemctl disable apt-daily-upgrade.service 
+systemctl disable apt-daily-upgrade.service
 
 sudo apt update
 sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh
@@ -254,7 +254,7 @@ sudo apt update && sudo apt-get install -y terraform
 curl -sL https://deb.nodesource.com/setup_12.x | sudo bash
 sudo apt update && sudo apt-get install -y nodejs
 sudo apt install -y ubuntu-drivers-common git
-sudo ubuntu-drivers autoinstall 
+sudo ubuntu-drivers autoinstall
 sudo rmmod nvidia && sudo nvidia-smi
 curl -s -L https://nvidia.GitHub.io/nvidia-docker/gpgkey | sudo apt-key add -
 curl -s -L https://nvidia.GitHub.io/nvidia-docker/ubuntu18.04/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list