From f8b4e49f7f574c3b87d901f0fce8feb69d970667 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 4 Oct 2023 18:42:56 +0200 Subject: [PATCH] Don't base 'vagrant' on virtualization (prep for Proxmox) --- Vagrantfile | 7 ++++++- playbook.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index eb6bf038..6a5b7ea9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -27,7 +27,12 @@ Vagrant.configure(2) do |config| if provisioned? config.ssh.guest_port = PORT ansible.extra_vars = { - ansible_port: PORT + ansible_port: PORT, + from_vagrant: true + } + else + ansible.extra_vars = { + from_vagrant: true } end end diff --git a/playbook.yml b/playbook.yml index d2ce5af8..de51a464 100644 --- a/playbook.yml +++ b/playbook.yml @@ -6,7 +6,7 @@ vars: ldap_dn: "dc=data,dc=coop" - vagrant: "{{ ansible_virtualization_role == 'guest' }}" + vagrant: "{{ from_vagrant is defined and from_vagrant }}" letsencrypt_enabled: "{{ not vagrant }}" base_domain: "{{ 'datacoop.devel' if vagrant else 'data.coop' }}"