Update documentation

Author: debovema

README.md

@@ -2,23 +2,31 @@
 
 ## Usage
 
-1. Retrieve your organization and token and export them:
+1. Create your SSH key pair and [add it in your authorized keys](https://console.scaleway.com/account/credentials)
+
+```
+ssh-keygen -t rsa -b 4096 -q -C 'scaleway' -N '' -f ~/.ssh/scaleway
+```
+
+2. [Retrieve your organization and API token](https://console.scaleway.com/account/credentials) and export them:
+
 ```
-export SCALEWAY_ORGANIZATION=<REDACTED>
-export SCALEWAY_TOKEN=<REDACTED>
+export SCW_ACCESS_KEY=<REDACTED>
+export SCW_SECRET_KEY=<REDACTED>
+export SCW_DEFAULT_ORGANIZATION_ID=<REDACTED>
 ```
 
-2. Initialize Terraform
+3. Initialize Terraform
 ```
 terraform init
 ```
 
-3. Apply default plan
+4. Apply default plan
 ```
 terraform apply
 ```
 
-4. SSH to the (first) created host
+5. SSH to the (first) created host
 ```
 ssh -i ~/.ssh/scaleway root@$(terraform output --json | jq -r '.public_ips.value[0]')
 ```

main.tf

@@ -1,9 +1,5 @@
 provider "scaleway" {
-  #access_key      = "<SCALEWAY-ACCESS-KEY>"
-  #secret_key      = "<SCALEWAY-SECRET-KEY>"
-  #organization_id = "<SCALEWAY-ORGANIZATION-ID>"
-  zone            = "fr-par-1"
-  region          = "fr-par"
+  # Provide configuration with environment variables, see https://www.terraform.io/docs/providers/scaleway/index.html#environment-variables
 }
 
 data "scaleway_image" "image" {
@@ -13,6 +9,16 @@ data "scaleway_image" "image" {
   name         = var.server_image
 }
 
+data "template_file" "userdata" {
+  template = file("${path.module}/cloud-init-user-data")
+
+  vars = {
+    codename = var.docker_distrib_codename
+    distrib  = var.docker_distrib
+    user     = var.username
+  }
+}
+
 resource "scaleway_instance_server" "node" {
   count = var.node_count
 
@@ -21,15 +27,14 @@ resource "scaleway_instance_server" "node" {
   image               = data.scaleway_image.image[0].id
   type                = var.server_type
   enable_dynamic_ip   = true
-  # boot_type           = "local"
 
   # initialization sequence
   cloud_init = data.template_file.userdata.rendered
 
   connection {
     host = element(scaleway_instance_server.node.*.public_ip, count.index)
     user = var.username
-    private_key = file("~/.ssh/scaleway")
+    private_key = file(var.ssh_key_file)
   }
 
   provisioner "remote-exec" {
@@ -43,23 +48,13 @@ resource "scaleway_instance_server" "node" {
   }
 }
 
-data "template_file" "userdata" {
-  template = file("${path.module}/cloud-init-user-data")
-
-  vars = {
-    codename = var.docker_distrib_codename
-    distrib  = var.docker_distrib
-    user     = var.username
-  }
-}
-
 resource "null_resource" "node" {
   count = var.node_count
 
   connection {
     host = element(scaleway_instance_server.node.*.public_ip, count.index)
     user = var.username
-    private_key = file("~/.ssh/scaleway")
+    private_key = file(var.ssh_key_file)
   }
 
   provisioner "remote-exec" {

variables.tf

@@ -23,6 +23,11 @@ variable "server_type" {
   default = "START1-S"
 }
 
+variable "ssh_key_file" {
+  type    = string
+  default = "~/.ssh/scaleway"
+}
+
 variable "username" {
   type    = string
   default = "user"