Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the type of provider #342

Merged
merged 3 commits into from
May 29, 2024
Merged

Add the type of provider #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81e2a6f
Add the type of provider
enolfc May 28, 2024
f722abd
Fix the user id
enolfc May 29, 2024
4a2cf98
Remove old VOs
enolfc May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cloud-info/ams-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ if [ -f site.json ]; then
export RCLONE_CONFIG_S3_ENDPOINT
S3_BUCKET_NAME="$(yq -r '.s3.bucket' <"$CHECKIN_SECRETS_FILE")"
export S3_BUCKET_NAME
RCLONE_CONFIG_S3_PROVIDER="$(yq -r '.s3.provider' <"$CHECKIN_SECRETS_FILE")"
export RCLONE_CONFIG_S3_PROVIDER
export RCLONE_CONFIG_S3_ACL=private
export RCLONE_CONFIG_S3_NO_CHECK_BUCKET=true
rclone copy site.json "s3:$S3_BUCKET_NAME/$SITE_NAME"
Expand Down
4 changes: 2 additions & 2 deletions deploy/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ fi
# copy the secrets to the /etc/egi/vos dir which is readable from the containers
cp secrets.yaml /etc/egi/vos/secrets.yaml

# make sure the container user (999) can access the files
chown -R 999:999 /etc/egi/
# make sure the container user (1999) can access the files
chown -R 1999:1999 /etc/egi/

GITHUB_COMMIT_URL="https://api.github.com/repos/EGI-Federation/fedcloud-catchall-operations/commits/$COMMIT_SHA/pulls"

Expand Down
3 changes: 0 additions & 3 deletions sites/CESGA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
gocdb: CESGA
endpoint: https://fedcloud-osservices.egi.cesga.es:5000/v3
vos:
- name: blazarmonitoring.asi.it
auth:
project_id: 835c2dd1be6f4e319dfce60b34c1b1c3
- name: covid19.eosc-synergy.eu
auth:
project_id: 972298c557184a2192ebc861f3184da8
Expand Down
3 changes: 0 additions & 3 deletions sites/CESNET-MCC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ vos:
- name: biomed
auth:
project_id: eca73ad6a84d4c0088063505c36349ab
- name: chipster.csc.fi
auth:
project_id: 2ce965f162c9434cb21ac25f3b05bd9f
- name: covid19.eosc-synergy.eu
auth:
project_id: 192e87f713474117a2a22704ac4da1a2
Expand Down
2 changes: 0 additions & 2 deletions vo-mappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ vos:
bioisi: "urn:mace:egi.eu:group:bioisi:role=vm_operator#aai.egi.eu"
biomed: "urn:mace:egi.eu:group:biomed:role=vm_operator#aai.egi.eu"
/biomed/vip: "urn:mace:egi.eu:group:biomed:role=vm_operator#aai.egi.eu"
blazarmonitoring.asi.it: "urn:mace:egi.eu:group:blazarmonitoring.asi.it:role=vm_operator#aai.egi.eu"
cesga: "urn:mace:egi.eu:group:cesga:role=vm_operator#aai.egi.eu"
cesga.es: "urn:mace:egi.eu:group:cesga.es:role=vm_operator#aai.egi.eu"
chipster.csc.fi: "urn:mace:egi.eu:group:chipster.csc.fi:role=vm_operator#aai.egi.eu"
cloud.egi.eu: "urn:mace:egi.eu:group:cloud.egi.eu:role=vm_operator#aai.egi.eu"
cms: "urn:mace:egi.eu:group:cms:role=vm_operator#aai.egi.eu"
covid19.eosc-synergy.eu: "urn:mace:egi.eu:group:covid19.eosc-synergy.eu:role=vm_operator#aai.egi.eu"
Expand Down