update

.gitlab-ci.yml

@@ -18,7 +18,7 @@ before_script:
   - export TF_VAR_SCW_PROJECT_ID=${TF_VAR_SCW_PROJECT_ID}
   - export TF_VAR_ENVIRONMENT=${ENVIRONMENT}
   - export TF_VAR_INSTANCE_COUNT=${TF_VAR_INSTANCE_COUNT}
-  - export TF_VAR_SSH_KEY_PATH=${SSH_KEY_PATH}.pub
+# - export TF_VAR_SSH_PUBLIC_KEY= SET AFTER SSH KEY CREATION
 
 stages:
   - prepare
@@ -30,11 +30,9 @@ stages:
 sshkey:
   stage: prepare
   script:
-    - ssh-keygen -b 2048 -t rsa -f $SSH_KEY_PATH -q -N ""
-    - ls
-    - ls /tmp
-    - echo $SSH_KEY_PATH
-    - cat $SSH_KEY_PATH
+    - ssh-keygen -b 2048 -t rsa -C "${ENVIRONMENT}-cma-update-tmp" -f ${SSH_KEY_PATH} -q -N ""
+    - export TF_VAR_SSH_PUBLIC_KEY=$(cat ${SSH_KEY_PATH}.pub)
+    - echo ${TF_VAR_SSH_PUBLIC_KEY}
 
 ansible-hosts-file:
   stage: prepare
@@ -76,7 +74,7 @@ apply:
 ansible:
   stage: deploy
   script:
-    - ansible-playbook -i $ANSIBLE_ROOT/tasks/update.yaml --private-key ${SSH_KEY_PATH}
+    - ansible-playbook -i ${ANSIBLE_ROOT}/tasks/update.yaml --private-key ${SSH_KEY_PATH}
 
 destroy:
   stage: destroy

terraform/main.tf

@@ -3,8 +3,8 @@
 ##############
 
 resource "scaleway_iam_ssh_key" "ssh-key" {
-  name       = "${var.ENVIRONMENT}-ssh-key"
+  name       = "${var.ENVIRONMENT}-cma-ssh-key"
   project_id = var.SCW_PROJECT_ID
 
-  public_key = file(var.SSH_KEY_PATH)
+  public_key = var.SSH_PUBLIC_KEY
 }

terraform/variables-gitlab.tf

@@ -23,7 +23,7 @@ variable "ENVIRONMENT" {
   description = "Environment of the deployment, contained in domains, subdomains and resources name convention"
 }
 
-variable "SSH_KEY_PATH" {
+variable "SSH_PUBLIC_KEY" {
   type        = string
   sensitive   = true
   description = "SSH key to use for the deployment"