From f0c7a5aa452206ec055ac967cd260cbd248e4072 Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Fri, 23 Dec 2022 09:05:32 +0100
Subject: [PATCH] Removed old usage of ssh in terraform
---
README.md | 2 --
instance-scripts/cloud-init.yml | 8 ++++++++
terraform/main.tf | 9 ---------
terraform/variables-gitlab.tf | 12 ------------
4 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 4fe84d2..b12a904 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,6 @@ Now, you can create a file for your variables information called **variables-loc
SCW_PROJECT_ID = ""
SCW_ACCESS_KEY = ""
SCW_SECRET_KEY = ""
-SCW_SSH_PUB_KEY = ""
-SCW_SSH_PRIVATE_KEY = ""
INSTANCES_COUNT = "2"
ENVIRONMENT = "devrust"
```
diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml
index 325bea8..fc615af 100644
--- a/instance-scripts/cloud-init.yml
+++ b/instance-scripts/cloud-init.yml
@@ -9,7 +9,9 @@ packages:
- curl
write_files:
+#
# Atrium config file
+#
- content: |
hostname: %atrium_hostname%.daag.alpha.grandlyon.com
debug_mode: false
@@ -31,7 +33,9 @@ write_files:
host: desktop-%atrium_count_index%
target: localhost:8081
path: /root/atrium.yaml
+#
# Code-server config file
+#
- content: |
bind-addr: 0.0.0.0:8080
auth: password
@@ -39,6 +43,10 @@ write_files:
cert: false
path: /root/config.yaml
+#
+# Webtop docker compose file
+#
+
runcmd:
#
# Install Rust
diff --git a/terraform/main.tf b/terraform/main.tf
index 924c654..861e30e 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,12 +1,3 @@
-############
-# Terraform SSH key
-############
-
-resource "scaleway_account_ssh_key" "ssh_key" {
- name = "FORGE alpha_project_manager"
- public_key = var.SCW_SSH_PUB_KEY
-}
-
############
# Public IP
############
diff --git a/terraform/variables-gitlab.tf b/terraform/variables-gitlab.tf
index db99aa3..f324f23 100644
--- a/terraform/variables-gitlab.tf
+++ b/terraform/variables-gitlab.tf
@@ -18,18 +18,6 @@ variable "SCW_SECRET_KEY" {
description = "Scaleway secret key"
}
-variable "SCW_SSH_PUB_KEY" {
- type = string
- sensitive = true
- description = "SSH public key from Gitlab agent installed on scaleway"
-}
-
-variable "SCW_SSH_PRIVATE_KEY" {
- type = string
- sensitive = true
- description = "SSH private key from Gitlab agent for remote-exec"
-}
-
variable "LETSENCRYPT_EMAIL" {
type = string
sensitive = true
--
GitLab