diff --git a/README.md b/README.md index 4fe84d208e4c315753c89b78ecb7dc5d0585eb3c..b12a904a5cacdf034e57b5180a0893c77b3fc0a5 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 325bea83fdc4db843ae28c360df9c61dc2fc4ff2..fc615af79baaa305a20a3e000b716eae378486e7 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 924c6549b64b1dd6e0eb8cf14c9225c7501540e6..861e30ebf645ab5222d677bd43383565f63408e1 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 db99aa38d04333cad2669385378b5895052f4206..f324f2306af0a3ef5639d2efdecc7618a462e6ec 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