From e1e82cbaf2982cf33fa6ecbb4b308156fe7744e3 Mon Sep 17 00:00:00 2001
From: Bertrand Lanson <bertrand.lanson@protonmail.com>
Date: Thu, 25 Jan 2024 22:54:31 +0100
Subject: [PATCH] chore(lint): fix some linting issues

---
 molecule/no_tls_multi_node/.vault_password    |  2 -
 molecule/no_tls_multi_node/ansible.cfg        |  8 ----
 .../etc/hashistack/consul_servers/.gitkeep    |  0
 .../etc/hashistack/globals.yml                | 46 +++++++++----------
 molecule/no_tls_multi_node/molecule.yml       |  2 +-
 molecule/no_tls_single_node/molecule.yml      |  2 +-
 6 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 100755 molecule/no_tls_multi_node/.vault_password
 delete mode 100644 molecule/no_tls_multi_node/ansible.cfg
 create mode 100644 molecule/no_tls_multi_node/etc/hashistack/consul_servers/.gitkeep

diff --git a/molecule/no_tls_multi_node/.vault_password b/molecule/no_tls_multi_node/.vault_password
deleted file mode 100755
index 82176d1..0000000
--- a/molecule/no_tls_multi_node/.vault_password
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-vault kv get --field=password kv_hs/ansible/ansible_vault
diff --git a/molecule/no_tls_multi_node/ansible.cfg b/molecule/no_tls_multi_node/ansible.cfg
deleted file mode 100644
index 0b7508f..0000000
--- a/molecule/no_tls_multi_node/ansible.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[defaults]
-nocows = true
-ansible_python_interpreter=/usr/bin/python3
-pipelining = true
-host_key_checking = false
-deprecation_warnings = true
-callbacks_enabled = profile_tasks, profile_roles
-vault_password_file = .vault_password
diff --git a/molecule/no_tls_multi_node/etc/hashistack/consul_servers/.gitkeep b/molecule/no_tls_multi_node/etc/hashistack/consul_servers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/molecule/no_tls_multi_node/etc/hashistack/globals.yml b/molecule/no_tls_multi_node/etc/hashistack/globals.yml
index c334019..0bc29b3 100644
--- a/molecule/no_tls_multi_node/etc/hashistack/globals.yml
+++ b/molecule/no_tls_multi_node/etc/hashistack/globals.yml
@@ -92,31 +92,31 @@
 #   - "/etc/timezone:/etc/timezone"
 #   - "/etc/localtime:/etc/localtime"
 
-#hashi_vault_start_service: true
+# hashi_vault_start_service: true
 hashi_vault_version: "latest"
-#hashi_vault_deploy_method: "{{ deployment_method }}"  # deployment method, either host or docker
-#hashi_vault_env_variables: {}
-#hashi_vault_data_dir: "/opt/vault"
-#hashi_vault_extra_files: false
-#hashi_vault_extra_files_src: /tmp/extra_files
-#hashi_vault_extra_files_dst: /etc/vault.d/extra_files
-#hashi_vault_extra_container_volumes: "{{ default_container_extra_volumes | union(extra_vault_container_volumes) | unique }}"
+# hashi_vault_deploy_method: "{{ deployment_method }}"  # deployment method, either host or docker
+# hashi_vault_env_variables: {}
+# hashi_vault_data_dir: "/opt/vault"
+# hashi_vault_extra_files: false
+# hashi_vault_extra_files_src: /tmp/extra_files
+# hashi_vault_extra_files_dst: /etc/vault.d/extra_files
+# hashi_vault_extra_container_volumes: "{{ default_container_extra_volumes | union(extra_vault_container_volumes) | unique }}"
 ##! vault configuration
-#hashi_vault_configuration:
-#  cluster_name: "{{ vault_cluster_name }}"
-#  cluster_addr: "http://{{ api_interface_address }}:8201"
-#  api_addr: "http://{{ api_interface_address }}:8200"
-#  ui: true
-#  disable_mlock: false
-#  disable_cache: false
-#  listener:
-#    tcp:
-#      address: "0.0.0.0:8200"
-#      tls_disable: true
-#      #tls_disable_client_certs: true
-#      #tls_cert_file: "{{ hashi_vault_data_dir }}/tls/cert.pem"
-#      #tls_key_file: "{{ hashi_vault_data_dir }}/tls/key.pem"
-#  storage: "{{ vault_storage_configuration }}"
+# hashi_vault_configuration:
+#   cluster_name: "{{ vault_cluster_name }}"
+#   cluster_addr: "http://{{ api_interface_address }}:8201"
+#   api_addr: "http://{{ api_interface_address }}:8200"
+#   ui: true
+#   disable_mlock: false
+#   disable_cache: false
+#   listener:
+#     tcp:
+#       address: "0.0.0.0:8200"
+#       tls_disable: true
+#       #tls_disable_client_certs: true
+#       #tls_cert_file: "{{ hashi_vault_data_dir }}/tls/cert.pem"
+#       #tls_key_file: "{{ hashi_vault_data_dir }}/tls/key.pem"
+#   storage: "{{ vault_storage_configuration }}"
 
 vault_extra_configuration:
   user_lockout:
diff --git a/molecule/no_tls_multi_node/molecule.yml b/molecule/no_tls_multi_node/molecule.yml
index c7e3776..27607b0 100644
--- a/molecule/no_tls_multi_node/molecule.yml
+++ b/molecule/no_tls_multi_node/molecule.yml
@@ -57,4 +57,4 @@ scenario:
     - idempotence
     - verify
     - cleanup
-    - destroy
\ No newline at end of file
+    - destroy
diff --git a/molecule/no_tls_single_node/molecule.yml b/molecule/no_tls_single_node/molecule.yml
index 50255e9..45e7864 100644
--- a/molecule/no_tls_single_node/molecule.yml
+++ b/molecule/no_tls_single_node/molecule.yml
@@ -37,4 +37,4 @@ scenario:
     - idempotence
     - verify
     - cleanup
-    - destroy
\ No newline at end of file
+    - destroy