backend upgrade

wescale · Sep 13, 2024 · c3b35fb · c3b35fb
1 parent 4cbabd6
commit c3b35fb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/TODO.md b/TODO.md
@@ -22,6 +22,7 @@ ROADMAP SEPTEMBRE:
 
 ROADMAP 1.0 (wood-dragon):
 
+
 * virer skopeo
 * globaliser le parametrage de nom de host pour les groupes masters hs_vault_inventory_masters_group
 * playbooks de back/restore à chaque étage.
@@ -33,3 +34,4 @@ ROADMAP 1.0 (wood-dragon):
 Alpine au printemps ?
 ajouter openwrt à la liste ?
 
+Définir:
diff --git a/playbooks/init.yml b/playbooks/init.yml
@@ -48,6 +48,7 @@
         content: |-
           hs_workspace: "{{ hs_workspace }}"
           hs_parent_domain: "{{ hs_parent_domain }}"
+          hs_archi: "{{ hs_archi }}"
           {%- raw %}
           hs_public_domain: >-
             {{ hs_workspace | regex_replace('_', '-') }}.{{ hs_parent_domain }}

diff --git a/roles/vault/handlers/main.yml b/roles/vault/handlers/main.yml
@@ -8,4 +8,4 @@
 
 - name: "Update ca trust"
   command: >-
-    {{ __hs_vault_update_trust_command }}
+    {{ __hs_update_trust_command }}
diff --git a/roles/vault/templates/tf_backend_s3.tf.j2 b/roles/vault/templates/tf_backend_s3.tf.j2
@@ -2,7 +2,9 @@ terraform {
   backend "s3" {
     bucket    = "{{ hs_vault_terraform_backend_config.bucket | default('') }}"
     key       = "{{ hs_vault_terraform_backend_config.key | default('') }}"
-    endpoint  = "{{ hs_vault_terraform_backend_config.endpoint | default('') }}"
+    endpoints = {
+      s3 = "{{ hs_vault_terraform_backend_config.endpoint | default('') }}"
+    }
     region    = "{{ hs_vault_terraform_backend_config.region | default('') }}"
 
     skip_credentials_validation = true

diff --git a/roles/vault_pt/templates/tf_backend_s3.tf.j2 b/roles/vault_pt/templates/tf_backend_s3.tf.j2
@@ -2,7 +2,9 @@ terraform {
   backend "s3" {
     bucket    = "{{ hs_vault_terraform_backend_config.bucket | default('') }}"
     key       = "{{ hs_vault_terraform_backend_config.key | default('') }}"
-    endpoint  = "{{ hs_vault_terraform_backend_config.endpoint | default('') }}"
+    endpoints = {
+      s3 = "{{ hs_vault_terraform_backend_config.endpoint | default('') }}"
+    }
     region    = "{{ hs_vault_terraform_backend_config.region | default('') }}"
 
     skip_credentials_validation = true