From 58700e5aef551156f8080dde509d0a3d70109378 Mon Sep 17 00:00:00 2001
From: Enol Fernandez <enol.fernandez@egi.eu>
Date: Tue, 10 Sep 2024 11:54:39 +0100
Subject: [PATCH] Do not quote variables in evn file

See https://github.com/moby/moby/issues/46773
---
 .../molecule/default/tests/test_default.py    |  2 +-
 .../catchall/templates/cloud-info.env.j2      | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/deploy/roles/catchall/molecule/default/tests/test_default.py b/deploy/roles/catchall/molecule/default/tests/test_default.py
index 5f31751..87ccc89 100644
--- a/deploy/roles/catchall/molecule/default/tests/test_default.py
+++ b/deploy/roles/catchall/molecule/default/tests/test_default.py
@@ -26,6 +26,6 @@ def test_site_files_region(host):
     assert host.file("/etc/egi/cloud-info/%s.yaml" % filename).exists
     assert host.file("/etc/egi/cloud-info/%s.env" % filename).exists
     assert host.file("/etc/egi/cloud-info/%s.env" % filename).contains(
-        'OS_REGION="region1"'
+        'OS_REGION=region1'
     )
     assert host.file("/etc/cron.d/cloud-info-%s" % filename).exists
diff --git a/deploy/roles/catchall/templates/cloud-info.env.j2 b/deploy/roles/catchall/templates/cloud-info.env.j2
index fc44b56..92c64b8 100644
--- a/deploy/roles/catchall/templates/cloud-info.env.j2
+++ b/deploy/roles/catchall/templates/cloud-info.env.j2
@@ -1,14 +1,14 @@
-AMS_HOST="{{ ams_host }}"
-AMS_PROJECT="{{ ams_project }}"
-AMS_TOKEN="{{ ams_token }}"
-CHECKIN_OIDC_TOKEN="{{ checkin.token_endpoint }}"
+AMS_HOST={{ ams_host }}
+AMS_PROJECT={{ ams_project }}
+AMS_TOKEN={{ ams_token }}
+CHECKIN_OIDC_TOKEN={{ checkin.token_endpoint }}
 CHECKIN_SECRETS_PATH=/etc/egi/vos/
-CLOUD_INFO_CONFIG="/etc/egi/cloud-info/{{ filename }}.yaml"
+CLOUD_INFO_CONFIG=/etc/egi/cloud-info/{{ filename }}.yaml
 OS_AUTH_TYPE=v3oidcaccesstoken
-OS_AUTH_URL="{{ site.endpoint }}"
+OS_AUTH_URL={{ site.endpoint }}
 OS_IDENTITY_PROVIDER=egi.eu
-OS_PROTOCOL="{{ site.protocol | default('openid') }}"
-{% if "region" in site %}
-OS_REGION="{{ site.region }}"
+OS_PROTOCOL={{ site.protocol | default('openid') }}
+{% if region in site %}
+OS_REGION={{ site.region }}
 {% endif %}
-SITE_NAME="{{ site.gocdb }}"
+SITE_NAME={{ site.gocdb }}