sidecar cleaning

wescale · Mar 22, 2024 · 6d494a9 · 6d494a9
1 parent 0e45bd9
commit 6d494a9
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 11 deletions.
diff --git a/playbooks/21_consul_install.yml b/playbooks/21_consul_install.yml
@@ -13,4 +13,3 @@
       include_role:
         name: vault-sidecar
       when: hs_install_vault_sidecar | bool
-
diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
@@ -31,4 +31,4 @@ tf_module_dest: "{{ hs_workspace_tf_modules_dir }}/{{ tf_module_name }}"
 
 glxclans_host_service_user_name: "caretaker"
 
-hs_install_vault_sidecar : true
+hs_install_vault_sidecar: true
diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml
@@ -28,9 +28,9 @@ hs_consul_node_cert_fullchain: "{{ hs_consul_local_secrets_dir }}/self.fullchain
 hs_consul_node_cert_private_key: "{{ hs_consul_local_secrets_dir }}/self.cert.key"
 
 
-  # TODO:
-  #__hs_consul_self_private_key: "{{ __hs_consul_tls_dir }}/self.cert.key"
-  #__hs_consul_self_certificate: "{{ __hs_consul_tls_dir }}/self.fullchain.cert.pem"
+# TODO:
+# __hs_consul_self_private_key: "{{ __hs_consul_tls_dir }}/self.cert.key"
+# __hs_consul_self_certificate: "{{ __hs_consul_tls_dir }}/self.fullchain.cert.pem"
 
 
 tf_module_name: "consul_config"

diff --git a/roles/vault-sidecar/README.md → roles/vault_sidecar/README.md b/roles/vault-sidecar/README.md → roles/vault_sidecar/README.md
diff --git a/roles/vault-sidecar/defaults/main.yml → roles/vault_sidecar/defaults/main.yml b/roles/vault-sidecar/defaults/main.yml → roles/vault_sidecar/defaults/main.yml
diff --git a/roles/vault-sidecar/handlers/main.yml → roles/vault_sidecar/handlers/main.yml b/roles/vault-sidecar/handlers/main.yml → roles/vault_sidecar/handlers/main.yml
@@ -4,4 +4,4 @@
   systemd:
     name: consul
     state: reloaded
-  become: yes
+
diff --git a/roles/vault-sidecar/meta/main.yml → roles/vault_sidecar/meta/main.yml b/roles/vault-sidecar/meta/main.yml → roles/vault_sidecar/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 galaxy_info:
-  role_name: "vault-sidecar"
+  role_name: "vault_sidecar"
   author: "Team"
   description: Hashistack Vault Sidecar
   issue_tracker_url: https://github.com/wescale/hashistack/issues

diff --git a/roles/vault-sidecar/tasks/main.yml → roles/vault_sidecar/tasks/main.yml b/roles/vault-sidecar/tasks/main.yml → roles/vault_sidecar/tasks/main.yml
@@ -1,5 +1,10 @@
 ---
-- name: Installer le proxy envoy pour Vault si install_envoy_proxy est vrai
+- name: "Install vault sidecar"
+  when:
+    - hs_install_vault_sidecar
+    - __hs_consul_is_master
+  tags:
+    - hs_consul_is_masters
   block:
     - name: Render vault-sidecar consul service
       template:
@@ -42,6 +47,4 @@
         state: started
         enabled: true
         name: vault-sidecar
-  when: hs_install_vault_sidecar and __hs_consul_is_master
-  tags:
-    - hs_consul_is_masters
+
diff --git a/...sidecar/templates/vault-sidecar.consul.j2 → ...sidecar/templates/vault-sidecar.consul.j2 b/...sidecar/templates/vault-sidecar.consul.j2 → ...sidecar/templates/vault-sidecar.consul.j2
diff --git a/...lt-sidecar/templates/vault-sidecar.env.j2 → ...lt_sidecar/templates/vault-sidecar.env.j2 b/...lt-sidecar/templates/vault-sidecar.env.j2 → ...lt_sidecar/templates/vault-sidecar.env.j2
diff --git a/...idecar/templates/vault-sidecar.service.j2 → ...idecar/templates/vault-sidecar.service.j2 b/...idecar/templates/vault-sidecar.service.j2 → ...idecar/templates/vault-sidecar.service.j2
diff --git a/roles/vault-sidecar/vars/main.yml → roles/vault_sidecar/vars/main.yml b/roles/vault-sidecar/vars/main.yml → roles/vault_sidecar/vars/main.yml