Merge branch 'master' into 'develop-oapi'

# Conflicts:
#   README.md
#   examples/main.tf

examples/config.tf

@@ -0,0 +1,5 @@
+provider "outscale" {
+    access_key_id = "${var.access_key_id}"
+    secret_key_id = "${var.secret_key_id}"
+    region     = "eu-west-2"
+}

examples/terraform.tfvars

@@ -0,0 +1,24 @@
+# relace xxxxxxxx with you own values
+
+access_key_id       = "<accesKey>"
+secret_key_id       = "<secretKey>"
+region              = "outscaleRegion"        # ie "eu-west-2"
+
+vm_id               = "i-xxxxxxxx"            # ie "i-c07a853d"
+
+vm_type             = "xx.xxxxxxxx"           # ie "tinav5.c2r4p1", "t2.micro", "c4.large"
+
+image_id            = "ami-xxxxxxxx"          # ie "ami-be23e98b"
+
+volume_id           = "vol-xxxxxxxx"          # ie "vol-29a39d9e"
+
+keypair_name        = "xxxxxxxxxxxxx"         # ie "outscale_sut_keypair"
+
+security_group_id   = "sg-xxxxxxxx"           # ie "sg-c73d3b6b"
+security_group_name = "<securityGroupName>    # ie "sgOutscaleCustomerTooling"
+
+account_id          = "<accountId>"
+
+dhcp_options_set_id = "dopt-xxxxxxxx"         # ie "dopt-6ce73c34"
+
+snapshot_id         = "snap-xxxxxxxx"         # ie "snap-439943a0"

examples/variables.tf

@@ -0,0 +1,26 @@
+variable "access_key_id" {}
+variable "secret_key_id" {}
+variable "region" {
+    default = "eu-west-2"
+}
+variable "access_key" {}
+variable "secret_key" {}
+#variable "region" {
+#    default = "eu-west-2"
+#}
+
+variable "ssh_privkey_filename" {
+    description = "The name of the file containning the private ssh key"
+    default     = "outscale_sutKeyPair.rsa.txt"
+}
+
+variable "vm_id" {}
+variable "vm_type" {}
+variable "image_id" {}
+variable "volume_id" {}
+variable "keypair_name" {}
+variable "security_group_id" {}
+variable "security_group_name" {}
+variable "account_id" {}
+variable "dhcp_options_set_id" {}
+variable "snapshot_id" {}