Update picluster.yml

marmila · Dec 19, 2023 · e508e7f · e508e7f
1 parent cc764aa
commit e508e7f
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/ansible/vars/picluster.yml b/ansible/vars/picluster.yml
@@ -229,18 +229,7 @@ restic_environment:
 #######################
 # Vault configuration
 #######################
-
-<<<<<<< Updated upstream
-<<<<<<< HEAD
-vault_hostname: "vault.picluster.marmilan.com"
-=======
-vault_hostname: "vault.picluster.ricsanfre.com"
-vault_version: 1.15.2
-
->>>>>>> upstream/master
-=======
 vault_hostname: "vault.picluster.marmilan.com"
->>>>>>> Stashed changes
 vault_dns: "{{ vault_hostname }}"
 vault_version: 1.15.2
 vault_enable_tls: true