Skip to content

Commit

Permalink
Do not quote variables in evn file
Browse files Browse the repository at this point in the history
  • Loading branch information
enolfc committed Sep 10, 2024
1 parent 3c18c0b commit 58700e5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions deploy/roles/catchall/templates/cloud-info.env.j2
Original file line number Diff line number Diff line change
@@ -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 }}

0 comments on commit 58700e5

Please sign in to comment.