update

.gitlab-ci.yml

@@ -25,14 +25,10 @@ stages:
   - prepare
   - build
   - plan
-  - deploy
+  - provisionning
+  - configuration
   - destroy
 
-sshkey:
-  stage: prepare
-  script:
-    - echo ${TF_VAR_SSH_PUBLIC_KEY}
-
 ansible-hosts-file:
   stage: prepare
   script:
@@ -49,7 +45,7 @@ validate:
   script:
     - gitlab-terraform validate
 
-plan:
+tf-plan:
   stage: build
   script:
     - gitlab-terraform plan
@@ -61,21 +57,21 @@ plan:
     reports:
       terraform: ${TF_ROOT}/plan.json
 
-apply:
-  stage: deploy
+tf-apply:
+  stage: provisionning
   environment:
     name: ${ENVIRONMENT}
   script:
     - gitlab-terraform apply
   dependencies:
-    - plan
+    - tf-plan
 
 ansible:
-  stage: deploy
+  stage: configuration
   script:
-    - ansible-playbook -i ${ANSIBLE_ROOT}/tasks/update.yaml --private-key ${SSH_KEY_PATH}
+    - ansible-playbook -i ${ANSIBLE_ROOT}/hosts.yaml ${ANSIBLE_ROOT}/tasks/update.yaml --private-key ${SSH_KEY_PATH}
 
-destroy:
+tf-destroy:
   stage: destroy
   environment:
     name: ${ENVIRONMENT}