From 3bb6f2039a87efd815b29113bedff428cb7a01a1 Mon Sep 17 00:00:00 2001
From: Nathan RODET <["nrodet@grandlyon.com"]>
Date: Tue, 5 Dec 2023 08:38:33 +0000
Subject: [PATCH] Added VOLUME for instance and input type for front
---
README.md | 2 ++
terraform/main.tf | 2 +-
terraform/variables-gitlab.tf | 2 +-
vars-deployment.json | 14 +++++++++++++-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index fa59f45..fb8ed94 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,8 @@ Once it's done, you will need to create the variable bellow :
- **TF_VAR_SCW_PROJECT_ID** : Project ID from your Scaleway project.
- **TF_VAR_SCW_SECRET_KEY** : Scaleway Secret Key.
- **TF_VAR_USER_PASSWORD** : User password for accessing services and instances.
+- **TF_VAR_INSTANCE_TYPE** : A type of instance to deploy. (DEV-S...)
+- **TF_VAR_VOLUME_DISK** : A number of GB for the volume attached to the instance.
## Step 3 : Every is set up, deployment is coming !
diff --git a/terraform/main.tf b/terraform/main.tf
index b0b6e89..3d82fbd 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -75,7 +75,7 @@ resource "scaleway_instance_server" "user_instance_server" {
root_volume {
volume_type = "b_ssd"
- size_in_gb = var.INSTANCE_VOLUME_GB
+ size_in_gb = var.INSTANCE_VOLUME_DISK
}
depends_on = [
diff --git a/terraform/variables-gitlab.tf b/terraform/variables-gitlab.tf
index c7effd2..7409479 100644
--- a/terraform/variables-gitlab.tf
+++ b/terraform/variables-gitlab.tf
@@ -46,7 +46,7 @@ variable "INSTANCE_TYPE" {
description = "Type of instance to create"
}
-variable "INSTANCE_VOLUME_GB" {
+variable "INSTANCE_VOLUME_DISK" {
type = number
description = "Number of b_ssd GB storage to attach to the instance"
}
diff --git a/vars-deployment.json b/vars-deployment.json
index f32aaae..0be4fd3 100644
--- a/vars-deployment.json
+++ b/vars-deployment.json
@@ -3,6 +3,7 @@
{
"name": "ENVIRONMENT",
"input_name": "Nom unique de l'environnement et du sous-domaine",
+ "input_type": "string",
"description": "Nom de l'environnement et du sous-domaine, identifiant unique au projet.",
"masked": false,
"validation_regex_explanation": "Une chaîne de caractère de 3 à 10 lettres, sans majuscules.",
@@ -11,14 +12,25 @@
{
"name": "TF_VAR_INSTANCE_COUNT",
"input_name": "Nombre d'instances",
+ "input_type": "number",
"description": "Nombre d'instance a créer.",
"masked": false,
"validation_regex_explanation": "Doit contenir une valeur entre 1 et 99.",
"validation_regex": "^\\d{1,2}$"
},
+ {
+ "name": "TF_VAR_INSTANCE_VOLUME_DISK",
+ "input_name": "Taille du volume",
+ "input_type": "number",
+ "description": "Taille du disk attaché à l'instance.",
+ "masked": false,
+ "validation_regex_explanation": "Doit contenir une valeur entre 10 et 999.",
+ "validation_regex": "^\\d{2,3}$"
+ },
{
"name": "TF_VAR_INSTANCE_TYPE",
- "input_name": "Instance type",
+ "input_name": "Type d'instance",
+ "input_type": "string-selection",
"description": "Type d'instance à créer.",
"masked": false,
"values": [
--
GitLab