From a0ec73e50d4d0a33ede4ec503176440f0826eab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:12:22 +0100 Subject: [PATCH] Bump github/super-linter from 6 to 7 (#360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump github/super-linter from 6 to 7 Bumps [github/super-linter](https://github.com/github/super-linter) from 6 to 7. - [Release notes](https://github.com/github/super-linter/releases) - [Changelog](https://github.com/github/super-linter/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/super-linter/compare/v6...v7) --- updated-dependencies: - dependency-name: github/super-linter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Linting fixes * No community.egi.eu * Quotes * Linting * Linting * regexp --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Enol Fernández --- .github/workflows/deploy-cloud-info.yml | 2 +- .github/workflows/deploy-image-sync.yml | 3 +- .github/workflows/deploy.yml | 2 +- .github/workflows/lint.yml | 6 +- .github/workflows/molecule.yml | 2 +- .github/workflows/python.yml | 24 +- CONTRIBUTING.md | 13 +- README.md | 2 +- caso/voms.json | 12 +- cloud-info/openstack.yaml | 60 ++--- deploy/README.md | 3 +- deploy/cloud-init.yaml | 6 +- deploy/image-sync/extra-cloud-init.yaml | 4 +- .../molecule/default/tests/test_default.py | 2 +- deploy/roles/catchall/tasks/docker.yml | 4 +- deploy/roles/catchall/tasks/main.yml | 3 +- .../catchall/templates/cloud-info.env.j2 | 18 +- sites/BIFI.yaml | 48 ++-- sites/CENI.yaml | 20 +- sites/CESGA-CLOUD.yaml | 48 ++-- sites/CESGA.yaml | 115 +++++---- sites/CESNET-MCC.yaml | 230 +++++++++--------- sites/CETA-GRID.yaml | 66 ++--- sites/CLOUDIFIN.yaml | 18 +- sites/CSTCLOUD-EGI.yaml | 37 ++- sites/CYFRONET-CLOUD.yaml | 30 +-- sites/DESY-CC.yaml | 30 +-- sites/ELKH-CLOUD.yaml | 14 +- sites/EODC.yaml | 12 +- sites/GRNET-OPENSTACK.yaml | 6 +- sites/IFCA-LCG2.yaml | 116 ++++----- sites/IISAS-FedCloud-cloud.yaml | 72 +++--- sites/ILIFU-UCT.yaml | 18 +- sites/IN2P3-IRES.yaml | 102 ++++---- sites/INFN-CLOUD-BARI.yaml | 36 +-- sites/INFN-CLOUD-CNAF.yaml | 30 +-- sites/NCG-INGRID-PT.yaml | 90 +++---- sites/SCAI.yaml | 18 +- sites/TR-FC1-ULAKBIM.yaml | 66 ++--- sites/UA-BITP.yaml | 24 +- sites/WALTON-CLOUD.yaml | 26 +- sites/fedcloud.srce.hr.yaml | 18 +- vo-mappings.yaml | 2 +- 43 files changed, 727 insertions(+), 731 deletions(-) diff --git a/.github/workflows/deploy-cloud-info.yml b/.github/workflows/deploy-cloud-info.yml index 3811a1ac..01aa5691 100644 --- a/.github/workflows/deploy-cloud-info.yml +++ b/.github/workflows/deploy-cloud-info.yml @@ -1,5 +1,5 @@ --- -name: 'Deploy cloud-info' +name: "Deploy cloud-info" on: push: diff --git a/.github/workflows/deploy-image-sync.yml b/.github/workflows/deploy-image-sync.yml index 70d90042..61d26793 100644 --- a/.github/workflows/deploy-image-sync.yml +++ b/.github/workflows/deploy-image-sync.yml @@ -1,5 +1,5 @@ --- -name: 'Deploy image sync' +name: "Deploy image sync" on: push: @@ -16,4 +16,3 @@ jobs: dir: "deploy/image-sync" tags: "docker,image-sync" secrets: inherit - diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 91a3b084..643067d9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ on: jobs: terraform: - name: 'Terraform' + name: "Terraform" runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d0ae11ab..663605fb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,9 +18,13 @@ jobs: # Runs the Super-Linter action - name: Run Super-Linter - uses: github/super-linter/slim@v6 + uses: github/super-linter/slim@v7 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Disabling these two for the moment, should be enabled later VALIDATE_CHECKOV: false VALIDATE_PYTHON_PYLINT: false + # Black is good enough for us + VALIDATE_PYTHON_PYINK: false + # Disabling this file as it gets confused + FILTER_REGEX_EXCLUDE: ".*.env.j2" diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 45453d56..f02817aa 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '>=3.9' + python-version: ">=3.9" - name: Install dependencies run: | pip install molecule molecule-plugins[docker] pytest pytest-testinfra diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 58c063ea..0fb0f734 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -10,15 +10,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Test cloud-info-generator - run: | - cd cloud-info - pip install -r requirements.txt - pip install . - cd cloud_info_catchall - python3 -m unittest + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + - name: Test cloud-info-generator + run: | + cd cloud-info + pip install -r requirements.txt + pip install . + cd cloud_info_catchall + python3 -m unittest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 10b24c6a..ccbb8619 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,11 +11,7 @@ in mind that contributions regarding how to best contribute are also welcome. ## Feedback and Questions -If you wish to discuss anything related to the project, please open an issue or -start a topic on the [EGI Community Forum](https://community.egi.eu). -The maintainers will sometimes move issues off of GitHub to the community forum -if it is thought that longer, more open-ended discussion would be beneficial, -including a wider community scope. +If you wish to discuss anything related to the project, please open an issue. ## Contribution Process @@ -23,7 +19,7 @@ Before proposing a contribution via pull request, ideally there is an open issue describing the need for your contribution (refer to this issue number when you submit the pull request). We have a 3 steps process for contributions. -1. Fork the project if you have not, and commit changes to a git branch +1. Fork the project if you have not, and commit changes to a Git branch 1. Create a GitHub Pull Request for your change, following the instructions in the pull request template. 1. Perform a [Code Review](#code-review-process) with the maintainers on the @@ -51,7 +47,7 @@ follows: 1. If a maintainer has feedback or questions on your changes then they will set `request changes` in the review and provide an explanation. -## Using git +## Using Git For collaboration purposes, it is best if you create a GitHub account and fork the repository to your own account. Once you do this you will be able to push @@ -60,7 +56,7 @@ be easier to send pull requests. ### Branches and Commits -You should submit your patch as a git branch named after the GitHub issue, such +You should submit your patch as a Git branch named after the GitHub issue, such as `#3`\. This is called a _topic branch_ and allows users to associate a branch of code with the issue. @@ -92,7 +88,6 @@ EGI benefits from a strong community of developers and system administrators, and vice-versa. If you have any questions or if you would like to get involved in the wider EGI community you can check out: -- [EGI Community Forum](https://community.egi.eu/) - [EGI site](https://www.egi.eu) **This file has been modified from the Chef Cookbook Contributing Guide**. diff --git a/README.md b/README.md index 982a7433..9ca83c61 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ generated in this repository. ## Deployment -Deployment is managed with GitHub actions, there is a VM for the +Deployment is managed with GitHub Actions, there is a VM for the cloud-info-provider and one VM for the image sync. Check the [deploy](./deploy) directory for details. Configuration is done with ansible using a [dedicated role](./deploy/roles/catchall): diff --git a/caso/voms.json b/caso/voms.json index 2498300d..0840a697 100644 --- a/caso/voms.json +++ b/caso/voms.json @@ -1,8 +1,8 @@ { - "ops": { - "projects": ["ops"] - }, - "fedcloud.egi.eu": { - "projects": ["foo", "bar"] - } + "ops": { + "projects": ["ops"] + }, + "fedcloud.egi.eu": { + "projects": ["foo", "bar"] + } } diff --git a/cloud-info/openstack.yaml b/cloud-info/openstack.yaml index 23e26e46..31dc853c 100644 --- a/cloud-info/openstack.yaml +++ b/cloud-info/openstack.yaml @@ -1,36 +1,36 @@ site: - name: SITE-NAME + name: SITE-NAME compute: - # Configure here the VOs supported at your installation - shares: - # Name of the VO - ops: - # Authentication for the VO into OpenStack - auth: - # the project id in OpenStack - project_id: xxxxx - # Default network type: none, public, public_only, private, private_only - default_network_type: public - # Public Network name - public_network_name: PUBLIC + # Configure here the VOs supported at your installation + shares: + # Name of the VO + ops: + # Authentication for the VO into OpenStack + auth: + # the project id in OpenStack + project_id: xxxxx + # Default network type: none, public, public_only, private, private_only + default_network_type: public + # Public Network name + public_network_name: PUBLIC - # A second VO - # fedcloud.egi.eu: - # auth: - # project_id: xxxx - # # Default network type: none, public, public_only, private, private_only - # default_network_type: public - # # Public Network name - # public_network_name: PUBLIC + # A second VO + # fedcloud.egi.eu: + # auth: + # project_id: xxxx + # # Default network type: none, public, public_only, private, private_only + # default_network_type: public + # # Public Network name + # public_network_name: PUBLIC - # Add as many VOs as needed + # Add as many VOs as needed - # Total number of cores available - total_cores: 0 - # Total RAM available (GB) - total_ram: 0 - # Hypervisor name - hypervisor: Foo Hypervisor - # Hypervisor version - hypervisor_version: 0.0.0 + # Total number of cores available + total_cores: 0 + # Total RAM available (GB) + total_ram: 0 + # Hypervisor name + hypervisor: Foo Hypervisor + # Hypervisor version + hypervisor_version: 0.0.0 diff --git a/deploy/README.md b/deploy/README.md index ecea8f66..7cf348be 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -10,13 +10,14 @@ Deployment is performed in 2 phases: 1. Terraforming the VM where the cloud-info-provider is run 1. Configuring the VM with ansible to run the cloud-info-provider -Everything is managed automatically via GitHub actions, on pull-requests +Everything is managed automatically via GitHub Actions, on pull-requests the terraform plan is updated and when merging, it's applied and ansible is run on the resulting infrastructure. ### Secrets Secrets are stored in GitHub. These include: + - `ANSIBLE_SECRETS`: `yaml` file with robot account credentials and AMS token for pushing messages - `APP_ID` and `APP_PRIVATE_KEY`: credentials for GitHub app capable of diff --git a/deploy/cloud-init.yaml b/deploy/cloud-init.yaml index 96fe581d..26aa1699 100644 --- a/deploy/cloud-init.yaml +++ b/deploy/cloud-init.yaml @@ -46,7 +46,7 @@ write_files: ./deploy.sh "$OAUTH_TOKEN" "$COMMIT_SHA" "$FEDCLOUD_LOCKER_TOKEN" \ "$TAGS" "$SHORT_COMMIT_SHA" "$SLACK_WEBHOOK_URL" path: /var/lib/cloud/scripts/per-boot/deploy.sh - permissions: '0755' + permissions: "0755" - content: | #!/bin/sh @@ -58,7 +58,7 @@ write_files: retry -t 10 -d 90 -- openstack --os-cloud backend object create \ --name "$VM_ID" fedcloud-catchall "/var/tmp/egi/$VM_ID" path: /usr/local/bin/notify.sh - permissions: '0755' + permissions: "0755" - content: | [Unit] Description=Notify the github action @@ -72,4 +72,4 @@ write_files: - content: "%CLOUDS_YAML%" encoding: base64 path: /etc/openstack/clouds.yaml - permissions: '0644' + permissions: "0644" diff --git a/deploy/image-sync/extra-cloud-init.yaml b/deploy/image-sync/extra-cloud-init.yaml index 530dad4c..50945359 100644 --- a/deploy/image-sync/extra-cloud-init.yaml +++ b/deploy/image-sync/extra-cloud-init.yaml @@ -1,7 +1,7 @@ # Disk layout disk_setup: /dev/sdb: - table_type: 'mbr' + table_type: "mbr" layout: true overwrite: false fs_setup: @@ -10,4 +10,4 @@ fs_setup: partition: any overwrite: false mounts: - - [ /dev/sdb, /var/cache/image-sync ] + - [/dev/sdb, /var/cache/image-sync] diff --git a/deploy/roles/catchall/molecule/default/tests/test_default.py b/deploy/roles/catchall/molecule/default/tests/test_default.py index a92d8437..5f31751d 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/tasks/docker.yml b/deploy/roles/catchall/tasks/docker.yml index ba0d3406..5eebe395 100644 --- a/deploy/roles/catchall/tasks/docker.yml +++ b/deploy/roles/catchall/tasks/docker.yml @@ -36,7 +36,7 @@ state: directory mode: "775" notify: - - Restart docker + - Restart docker - name: Configure docker ansible.builtin.copy: @@ -54,4 +54,4 @@ dest: /etc/docker/daemon.json mode: "660" notify: - - Restart docker + - Restart docker diff --git a/deploy/roles/catchall/tasks/main.yml b/deploy/roles/catchall/tasks/main.yml index f0b10c65..7c0d67b2 100644 --- a/deploy/roles/catchall/tasks/main.yml +++ b/deploy/roles/catchall/tasks/main.yml @@ -12,7 +12,7 @@ apply: tags: "docker" # this is only executed if explicity requested - tags: ['never', 'docker'] + tags: ["never", "docker"] - name: Load site configuration tags: ["cloud-info", "image-sync"] @@ -53,7 +53,6 @@ - "{{ sites }}" when: sites is iterable - - name: Image sync config tags: ["image-sync"] ansible.builtin.include_tasks: diff --git a/deploy/roles/catchall/templates/cloud-info.env.j2 b/deploy/roles/catchall/templates/cloud-info.env.j2 index af6843d4..fc44b561 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') }} +OS_PROTOCOL="{{ site.protocol | default('openid') }}" {% if "region" in site %} -OS_REGION={{ site.region }} +OS_REGION="{{ site.region }}" {% endif %} -SITE_NAME={{ site.gocdb }} +SITE_NAME="{{ site.gocdb }}" diff --git a/sites/BIFI.yaml b/sites/BIFI.yaml index 310fc5e1..dba903f9 100644 --- a/sites/BIFI.yaml +++ b/sites/BIFI.yaml @@ -2,27 +2,27 @@ gocdb: BIFI endpoint: https://colossus.cesar.unizar.es:5000/v3 vos: -- name: covid19.eosc-synergy.eu - auth: - project_id: f07679a8d4ac40379b51db4236bc3c27 -- name: eosc-synergy.eu - auth: - project_id: 0c1de26753ed4311a6cefff9094ad3e3 -- name: lagoproject.net - auth: - project_id: 21a85c6ead0346b08e22709d0422799d -- name: o3as.data.kit.edu - auth: - project_id: 621b1977bb384beab1519713c7e695f0 -- name: ops - auth: - project_id: 6930771153aa4b8d8637222dec8fd949 -- name: worsica.vo.incd.pt - auth: - project_id: 46f55a92f3904d509d75525930d8d0eb -- name: vo.phiri.eu - auth: - project_id: 1d64c6e5237b46af8acb44f79b7b5a15 -- name: vo.bd4nrg.eu - auth: - project_id: 3e18859848be489a8d741b264049f4a9 + - name: covid19.eosc-synergy.eu + auth: + project_id: f07679a8d4ac40379b51db4236bc3c27 + - name: eosc-synergy.eu + auth: + project_id: 0c1de26753ed4311a6cefff9094ad3e3 + - name: lagoproject.net + auth: + project_id: 21a85c6ead0346b08e22709d0422799d + - name: o3as.data.kit.edu + auth: + project_id: 621b1977bb384beab1519713c7e695f0 + - name: ops + auth: + project_id: 6930771153aa4b8d8637222dec8fd949 + - name: worsica.vo.incd.pt + auth: + project_id: 46f55a92f3904d509d75525930d8d0eb + - name: vo.phiri.eu + auth: + project_id: 1d64c6e5237b46af8acb44f79b7b5a15 + - name: vo.bd4nrg.eu + auth: + project_id: 3e18859848be489a8d741b264049f4a9 diff --git a/sites/CENI.yaml b/sites/CENI.yaml index 094fc872..59247373 100644 --- a/sites/CENI.yaml +++ b/sites/CENI.yaml @@ -1,13 +1,13 @@ --- -gocdb: CENI +gocdb: CENI endpoint: https://openstack.ceni.org.cn:5000/v3 vos: -- name: ops - auth: - project_id: 90c0ce1b2f1545c0b9a05d9a8fd45102 -- name: vo.access.egi.eu - auth: - project_id: b106744c783543518f505dda45632697 -- name: vo.cnic.cn - auth: - project_id: 3105c59401794130821a68e219726ccc + - name: ops + auth: + project_id: 90c0ce1b2f1545c0b9a05d9a8fd45102 + - name: vo.access.egi.eu + auth: + project_id: b106744c783543518f505dda45632697 + - name: vo.cnic.cn + auth: + project_id: 3105c59401794130821a68e219726ccc diff --git a/sites/CESGA-CLOUD.yaml b/sites/CESGA-CLOUD.yaml index f8606180..70d7c38f 100644 --- a/sites/CESGA-CLOUD.yaml +++ b/sites/CESGA-CLOUD.yaml @@ -2,27 +2,27 @@ gocdb: CESGA-CLOUD endpoint: https://cloud.srv.cesga.es:5000/v3 vos: -- name: ops - auth: - project_id: e92677d7fc0742a7b1e3a33285e2296c -- name: cesga.es - auth: - project_id: 7274a80de0954f0f88a594f94642b1fb -- name: eosc-synergy.eu - auth: - project_id: 8b3f809f2b0841e6b91b7f60d08da8c9 -- name: vo.deltares.nl - auth: - project_id: 8a244d1b0d0f4f8e8c9519fae4cfc8ee -- name: bioisi - auth: - project_id: 458f3225272243d7b1c0551d3af3f130 -- name: vo.plocan.eu - auth: - project_id: 2ce3f160cdd64d46b02f3b1f856ed8ec -- name: vo.emso-eric.eu - auth: - project_id: c76094afeb98405d921820ae7588d92a -- name: vo.aneris.eu - auth: - project_id: ec4d71d1142b46a39f7cf704d79219c5 + - name: ops + auth: + project_id: e92677d7fc0742a7b1e3a33285e2296c + - name: cesga.es + auth: + project_id: 7274a80de0954f0f88a594f94642b1fb + - name: eosc-synergy.eu + auth: + project_id: 8b3f809f2b0841e6b91b7f60d08da8c9 + - name: vo.deltares.nl + auth: + project_id: 8a244d1b0d0f4f8e8c9519fae4cfc8ee + - name: bioisi + auth: + project_id: 458f3225272243d7b1c0551d3af3f130 + - name: vo.plocan.eu + auth: + project_id: 2ce3f160cdd64d46b02f3b1f856ed8ec + - name: vo.emso-eric.eu + auth: + project_id: c76094afeb98405d921820ae7588d92a + - name: vo.aneris.eu + auth: + project_id: ec4d71d1142b46a39f7cf704d79219c5 diff --git a/sites/CESGA.yaml b/sites/CESGA.yaml index 404e2a2a..339ff3aa 100644 --- a/sites/CESGA.yaml +++ b/sites/CESGA.yaml @@ -2,61 +2,60 @@ gocdb: CESGA endpoint: https://fedcloud-osservices.egi.cesga.es:5000/v3 vos: -- name: covid19.eosc-synergy.eu - auth: - project_id: 972298c557184a2192ebc861f3184da8 -- name: d4science.org - auth: - project_id: 69522b33d33a4c53a471eb269e069d5b -- name: enmr.eu - auth: - project_id: 7f23f4323ff54359964d3afdd1f2a8c7 -- name: eosc-synergy.eu - auth: - project_id: 57bcb0efcba4467fa225add92fdc194c -- name: fusion - auth: - project_id: 11b8dbe34f9f4379bf2339121a1429e0 -- name: lagoproject.net - auth: - project_id: 50a0ce2d050048c68bc3094b6682d837 -- name: mswss.ui.savba.sk - auth: - project_id: a91154f2803b4414a4f34039539833fa -- name: o3as.data.kit.edu - auth: - project_id: 4a22f140a5fb4678aa1599fbf0b44b2f -- name: ops - auth: - project_id: 707711a8c2154caab35fa9ccdf38434a -- name: vo.access.egi.eu - auth: - project_id: 3a8e9d966e644405bf19b536adf7743d -- name: vo.clarin.eu - auth: - project_id: f5575c54231747109d6b2466334085bb -- name: vo.emso-eric.eu - auth: - project_id: 916506ac136741c28e4326975eef0bff -- name: vo.envri-fair.eu - auth: - project_id: c1c9c25774fe418599bced1d45862c60 -- name: vo.nextgeoss.eu - auth: - project_id: b1d2ef2cc2284c57bcde21cf4ab141e3 -- name: vo.notebooks.egi.eu - auth: - project_id: fcaf23d103c1485694e7494a59ee5f09 -- name: vo.stars4all.eu - auth: - project_id: ed8399d460a44bde9c69484ccc6a53b6 -- name: vo.deltares.nl - auth: - project_id: 6808ae202f6044f8aea95495ac3588b9 -- name: vo.plocan.eu - auth: - project_id: 7d4e7efd1eab46fb949aa06c35aeb60d -- name: bioisi - auth: - project_id: f6c8441325e040e39a79a41cf39d3066 - + - name: covid19.eosc-synergy.eu + auth: + project_id: 972298c557184a2192ebc861f3184da8 + - name: d4science.org + auth: + project_id: 69522b33d33a4c53a471eb269e069d5b + - name: enmr.eu + auth: + project_id: 7f23f4323ff54359964d3afdd1f2a8c7 + - name: eosc-synergy.eu + auth: + project_id: 57bcb0efcba4467fa225add92fdc194c + - name: fusion + auth: + project_id: 11b8dbe34f9f4379bf2339121a1429e0 + - name: lagoproject.net + auth: + project_id: 50a0ce2d050048c68bc3094b6682d837 + - name: mswss.ui.savba.sk + auth: + project_id: a91154f2803b4414a4f34039539833fa + - name: o3as.data.kit.edu + auth: + project_id: 4a22f140a5fb4678aa1599fbf0b44b2f + - name: ops + auth: + project_id: 707711a8c2154caab35fa9ccdf38434a + - name: vo.access.egi.eu + auth: + project_id: 3a8e9d966e644405bf19b536adf7743d + - name: vo.clarin.eu + auth: + project_id: f5575c54231747109d6b2466334085bb + - name: vo.emso-eric.eu + auth: + project_id: 916506ac136741c28e4326975eef0bff + - name: vo.envri-fair.eu + auth: + project_id: c1c9c25774fe418599bced1d45862c60 + - name: vo.nextgeoss.eu + auth: + project_id: b1d2ef2cc2284c57bcde21cf4ab141e3 + - name: vo.notebooks.egi.eu + auth: + project_id: fcaf23d103c1485694e7494a59ee5f09 + - name: vo.stars4all.eu + auth: + project_id: ed8399d460a44bde9c69484ccc6a53b6 + - name: vo.deltares.nl + auth: + project_id: 6808ae202f6044f8aea95495ac3588b9 + - name: vo.plocan.eu + auth: + project_id: 7d4e7efd1eab46fb949aa06c35aeb60d + - name: bioisi + auth: + project_id: f6c8441325e040e39a79a41cf39d3066 diff --git a/sites/CESNET-MCC.yaml b/sites/CESNET-MCC.yaml index 42810c89..95e10334 100644 --- a/sites/CESNET-MCC.yaml +++ b/sites/CESNET-MCC.yaml @@ -2,118 +2,118 @@ gocdb: CESNET-MCC endpoint: https://identity.cloud.muni.cz/v3 vos: -- name: biomed - auth: - project_id: eca73ad6a84d4c0088063505c36349ab -- name: covid19.eosc-synergy.eu - auth: - project_id: 192e87f713474117a2a22704ac4da1a2 -- name: cryoem.instruct-eric.eu - auth: - project_id: d0ebf0fad0a04be19f93fdf794469544 -- name: demo.fedcloud.egi.eu - auth: - project_id: 10b972eed97940089b234f6257d7db72 -- name: drihm.eu - auth: - project_id: 4216152b63f34cc28401bb9bbd40b0bf -- name: dteam - auth: - project_id: 0aa5b696969c42988b18beda3f85b885 -#Not an EGI VO -#- name: egi-services -# auth: -# project_id: 723f0655bb484ea892249ac7183c9581 -- name: enmr.eu - auth: - project_id: 8f4f75b011fe44ef99105a32817d2fc0 -- name: eosc-synergy.eu - auth: - project_id: d85ca93c937a4a97adf134ec2593296d -- name: fusion - auth: - project_id: 426b25102bdb49b8b6969cef5aabaecf -- name: ops - auth: - project_id: 73ee46f9a64243d2955ecb07e4f28289 -- name: peachnote.com - auth: - project_id: bf5fbc4e22164e4d8a464e9c97706830 -- name: training.egi.eu - auth: - project_id: eae2aa7f26334104906106bca4b82ae3 -- name: umsa.cerit-sc.cz - auth: - project_id: 10e31299a9b548fdbe36e4dbe571168e -- name: /biomed/vip - auth: - project_id: 721251d671ea4268876043a9474ba3de -- name: vo.clarin.eu - auth: - project_id: 5fc606127d2d4499b959ff79219c7144 -- name: vo.elixir-europe.org - auth: - project_id: 90f5ae8fb33e45888be97f152bc2f67b -- name: vo.emphasisproject.eu - auth: - project_id: b953842bf4204dc98054f6c3ae581cb5 -- name: vo.europlanet-vespa.eu - auth: - project_id: 89140661b6be4ef281ab7a67d4c83e0c -- name: vo.geoss.eu - auth: - project_id: 24869cfe0e094f59a3110429e068eef2 -- name: vo.indigo-datacloud.eu - auth: - project_id: 25cb49baedbf40a194729ff6802c8491 -- name: vo.nextgeoss.eu - auth: - project_id: 081396a827c94f3da0c922cf6d8fb7f7 -- name: vo.notebooks.egi.eu - auth: - project_id: 28b74c3073a74b34a729cbf9777e7344 -- name: vo.panosc.eu - auth: - project_id: d868dfd63a674d94bbd9d9b7b54443e3 -- name: icecube - auth: - project_id: 14c82a422b094c32b4858ce959fa1a0d -- name: university.eosc-synergy.eu - auth: - project_id: a478488b79df46c4a086ecb7a321b038 -- name: waterwatch.c-scale.eu - auth: - project_id: acf5d12568914e65a80150efb087cbb8 -- name: vo.pangeo.eu - auth: - project_id: 05e0ff6e03774082aadacc75bfc1d783 -- name: vo.environmental.egi.eu - auth: - project_id: 29e6fbf618984a0c98ffcdf0222ad815 -- name: vo.eoscfuture-sp.panosc.eu - auth: - project_id: c91eeff7bf7845bc901b319512f2ebdb -- name: vo.inactive-sarscov2.eu - auth: - project_id: 0df0a85cfe8e47d38ce9142858845800 -- name: eval.c-scale.eu - auth: - project_id: d6283bc95d5c4296abb799596867818c -- name: /vo.pangeo.eu/swift - auth: - project_id: 57102d3e06b7476088fe4924370ae170 -- name: /vo.pangeo.eu/escience - auth: - project_id: 5e5a45e153d3424997fda0c4fd21a21f -- name: vo.thepund.it - auth: - project_id: a0faee5136134d1ab1e62385c3e45c75 -- name: vo.enes.org - auth: - project_id: 786566209a7444f89a561172fa28e117 -- name: vo.envrihub.eu - auth: - project_id: 61d8e5a65aff45fabc41ae954e905d11 -- name: vo.radiotracers4psma.eu - auth: - project_id: c92b14a949664e74b1afdac69adc724a + - name: biomed + auth: + project_id: eca73ad6a84d4c0088063505c36349ab + - name: covid19.eosc-synergy.eu + auth: + project_id: 192e87f713474117a2a22704ac4da1a2 + - name: cryoem.instruct-eric.eu + auth: + project_id: d0ebf0fad0a04be19f93fdf794469544 + - name: demo.fedcloud.egi.eu + auth: + project_id: 10b972eed97940089b234f6257d7db72 + - name: drihm.eu + auth: + project_id: 4216152b63f34cc28401bb9bbd40b0bf + - name: dteam + auth: + project_id: 0aa5b696969c42988b18beda3f85b885 + #Not an EGI VO + #- name: egi-services + # auth: + # project_id: 723f0655bb484ea892249ac7183c9581 + - name: enmr.eu + auth: + project_id: 8f4f75b011fe44ef99105a32817d2fc0 + - name: eosc-synergy.eu + auth: + project_id: d85ca93c937a4a97adf134ec2593296d + - name: fusion + auth: + project_id: 426b25102bdb49b8b6969cef5aabaecf + - name: ops + auth: + project_id: 73ee46f9a64243d2955ecb07e4f28289 + - name: peachnote.com + auth: + project_id: bf5fbc4e22164e4d8a464e9c97706830 + - name: training.egi.eu + auth: + project_id: eae2aa7f26334104906106bca4b82ae3 + - name: umsa.cerit-sc.cz + auth: + project_id: 10e31299a9b548fdbe36e4dbe571168e + - name: /biomed/vip + auth: + project_id: 721251d671ea4268876043a9474ba3de + - name: vo.clarin.eu + auth: + project_id: 5fc606127d2d4499b959ff79219c7144 + - name: vo.elixir-europe.org + auth: + project_id: 90f5ae8fb33e45888be97f152bc2f67b + - name: vo.emphasisproject.eu + auth: + project_id: b953842bf4204dc98054f6c3ae581cb5 + - name: vo.europlanet-vespa.eu + auth: + project_id: 89140661b6be4ef281ab7a67d4c83e0c + - name: vo.geoss.eu + auth: + project_id: 24869cfe0e094f59a3110429e068eef2 + - name: vo.indigo-datacloud.eu + auth: + project_id: 25cb49baedbf40a194729ff6802c8491 + - name: vo.nextgeoss.eu + auth: + project_id: 081396a827c94f3da0c922cf6d8fb7f7 + - name: vo.notebooks.egi.eu + auth: + project_id: 28b74c3073a74b34a729cbf9777e7344 + - name: vo.panosc.eu + auth: + project_id: d868dfd63a674d94bbd9d9b7b54443e3 + - name: icecube + auth: + project_id: 14c82a422b094c32b4858ce959fa1a0d + - name: university.eosc-synergy.eu + auth: + project_id: a478488b79df46c4a086ecb7a321b038 + - name: waterwatch.c-scale.eu + auth: + project_id: acf5d12568914e65a80150efb087cbb8 + - name: vo.pangeo.eu + auth: + project_id: 05e0ff6e03774082aadacc75bfc1d783 + - name: vo.environmental.egi.eu + auth: + project_id: 29e6fbf618984a0c98ffcdf0222ad815 + - name: vo.eoscfuture-sp.panosc.eu + auth: + project_id: c91eeff7bf7845bc901b319512f2ebdb + - name: vo.inactive-sarscov2.eu + auth: + project_id: 0df0a85cfe8e47d38ce9142858845800 + - name: eval.c-scale.eu + auth: + project_id: d6283bc95d5c4296abb799596867818c + - name: /vo.pangeo.eu/swift + auth: + project_id: 57102d3e06b7476088fe4924370ae170 + - name: /vo.pangeo.eu/escience + auth: + project_id: 5e5a45e153d3424997fda0c4fd21a21f + - name: vo.thepund.it + auth: + project_id: a0faee5136134d1ab1e62385c3e45c75 + - name: vo.enes.org + auth: + project_id: 786566209a7444f89a561172fa28e117 + - name: vo.envrihub.eu + auth: + project_id: 61d8e5a65aff45fabc41ae954e905d11 + - name: vo.radiotracers4psma.eu + auth: + project_id: c92b14a949664e74b1afdac69adc724a diff --git a/sites/CETA-GRID.yaml b/sites/CETA-GRID.yaml index 7ed113c3..2d27bf6d 100644 --- a/sites/CETA-GRID.yaml +++ b/sites/CETA-GRID.yaml @@ -2,36 +2,36 @@ gocdb: CETA-GRID endpoint: https://controller.ceta-ciemat.es:5000/v3/ vos: -- name: covid19.eosc-synergy.eu - auth: - project_id: 4eda27e5514c496b9878e2b87a7c8515 -- name: dteam - auth: - project_id: 470c60ff781949be87ec17e0d3e208d9 -- name: eosc-synergy.eu - auth: - project_id: 8e0f99db8b7845d38512f0ddce9049e3 -- name: fedcloud.egi.eu - auth: - project_id: 8ad2ac56f33540cdbfbd45ad5095d924 -- name: lagoproject.net - auth: - project_id: 3afddede673548a99dc5c2e819baf5a8 -- name: o3as.data.kit.edu - auth: - project_id: b8f5431e14e64c1ca2264f44ce6b0567 -- name: ops - auth: - project_id: f43bd8db629d40bbb85ffdb0dfdba28e -- name: worsica.vo.incd.pt - auth: - project_id: ef3e041a01a44915a3654c7c09af1fb1 -- name: saps-vo.i3m.upv.es - auth: - project_id: 0691729e8ea04d90aab9603cb1d2dc7f -- name: EOServices-vo.indra.es - auth: - project_id: 9882d85f83884bbf9cf0dd4ab54c0aac -- name: mswss.ui.savba.sk - auth: - project_id: a9236c4cdd9f49ffa9663b4678132080 + - name: covid19.eosc-synergy.eu + auth: + project_id: 4eda27e5514c496b9878e2b87a7c8515 + - name: dteam + auth: + project_id: 470c60ff781949be87ec17e0d3e208d9 + - name: eosc-synergy.eu + auth: + project_id: 8e0f99db8b7845d38512f0ddce9049e3 + - name: fedcloud.egi.eu + auth: + project_id: 8ad2ac56f33540cdbfbd45ad5095d924 + - name: lagoproject.net + auth: + project_id: 3afddede673548a99dc5c2e819baf5a8 + - name: o3as.data.kit.edu + auth: + project_id: b8f5431e14e64c1ca2264f44ce6b0567 + - name: ops + auth: + project_id: f43bd8db629d40bbb85ffdb0dfdba28e + - name: worsica.vo.incd.pt + auth: + project_id: ef3e041a01a44915a3654c7c09af1fb1 + - name: saps-vo.i3m.upv.es + auth: + project_id: 0691729e8ea04d90aab9603cb1d2dc7f + - name: EOServices-vo.indra.es + auth: + project_id: 9882d85f83884bbf9cf0dd4ab54c0aac + - name: mswss.ui.savba.sk + auth: + project_id: a9236c4cdd9f49ffa9663b4678132080 diff --git a/sites/CLOUDIFIN.yaml b/sites/CLOUDIFIN.yaml index 11481356..3c47a3b3 100644 --- a/sites/CLOUDIFIN.yaml +++ b/sites/CLOUDIFIN.yaml @@ -2,12 +2,12 @@ gocdb: CLOUDIFIN endpoint: https://cloud-ctrl.nipne.ro:443/v3 vos: -- name: dteam - auth: - project_id: f726c16f3e2346bf891021c89b4dc58d -- name: fedcloud.egi.eu - auth: - project_id: 245cdfdce0c84227b9b60d247618f635 -- name: ops - auth: - project_id: 21440821c8904e5b8ce5ec101a1ca879 + - name: dteam + auth: + project_id: f726c16f3e2346bf891021c89b4dc58d + - name: fedcloud.egi.eu + auth: + project_id: 245cdfdce0c84227b9b60d247618f635 + - name: ops + auth: + project_id: 21440821c8904e5b8ce5ec101a1ca879 diff --git a/sites/CSTCLOUD-EGI.yaml b/sites/CSTCLOUD-EGI.yaml index cb2cd0a8..5b85ed42 100644 --- a/sites/CSTCLOUD-EGI.yaml +++ b/sites/CSTCLOUD-EGI.yaml @@ -2,22 +2,21 @@ gocdb: CSTCLOUD-EGI endpoint: https://federation.cstcloud.cn:5000/v3 vos: -- name: ops - auth: - project_id: 6788216d161747d085ec60cacb6f8543 -- name: vo.access.egi.eu - auth: - project_id: 16d983af7ac84860acbddbc7e395a3fd -- name: vo.cnic.cn - auth: - project_id: a46c8e0acd9e4a01ad413f5654d7aae9 -- name: enmr.eu - auth: - project_id: ddf1ddbcdfaf4e42b722719b964b5fab -- name: eiscat.se - auth: - project_id: be43e5f92b3e49c387a5b00549938770 -- name: fedcloud.egi.eu - auth: - project_id: b33f036b6a584c4d844df5a505f53d16 - + - name: ops + auth: + project_id: 6788216d161747d085ec60cacb6f8543 + - name: vo.access.egi.eu + auth: + project_id: 16d983af7ac84860acbddbc7e395a3fd + - name: vo.cnic.cn + auth: + project_id: a46c8e0acd9e4a01ad413f5654d7aae9 + - name: enmr.eu + auth: + project_id: ddf1ddbcdfaf4e42b722719b964b5fab + - name: eiscat.se + auth: + project_id: be43e5f92b3e49c387a5b00549938770 + - name: fedcloud.egi.eu + auth: + project_id: b33f036b6a584c4d844df5a505f53d16 diff --git a/sites/CYFRONET-CLOUD.yaml b/sites/CYFRONET-CLOUD.yaml index f7befbe3..6188059a 100644 --- a/sites/CYFRONET-CLOUD.yaml +++ b/sites/CYFRONET-CLOUD.yaml @@ -2,18 +2,18 @@ gocdb: CYFRONET-CLOUD endpoint: https://panel.cloud.cyfronet.pl:5000/v3/ vos: -- name: culturalheritage.vo.egi.eu - auth: - project_id: 0a9d5dd734854a15a4b5d1c8a21772bc -- name: dteam - auth: - project_id: 9b40bb40431c4f4180c280b6675f9bb9 -- name: fedcloud.egi.eu - auth: - project_id: 1295728b1ce747fb96c043c6e254ad6f -- name: ops - auth: - project_id: c030e7317150482d920717888e82ce5f -- name: vo.access.egi.eu - auth: - project_id: 7635176e4f9b4cb4b3f4192a5bf901a3 + - name: culturalheritage.vo.egi.eu + auth: + project_id: 0a9d5dd734854a15a4b5d1c8a21772bc + - name: dteam + auth: + project_id: 9b40bb40431c4f4180c280b6675f9bb9 + - name: fedcloud.egi.eu + auth: + project_id: 1295728b1ce747fb96c043c6e254ad6f + - name: ops + auth: + project_id: c030e7317150482d920717888e82ce5f + - name: vo.access.egi.eu + auth: + project_id: 7635176e4f9b4cb4b3f4192a5bf901a3 diff --git a/sites/DESY-CC.yaml b/sites/DESY-CC.yaml index fdfc2c8d..38520843 100644 --- a/sites/DESY-CC.yaml +++ b/sites/DESY-CC.yaml @@ -2,18 +2,18 @@ gocdb: DESY-CC endpoint: https://ccmi-api.desy.de:5000/v3 vos: -- name: fedcloud.egi.eu - auth: - project_id: 84ef898d6bdc4d01aaabdf1dda2ca791 -- name: vo.panosc.eu - auth: - project_id: ac06d127fc14463c9bd283f08e731eb2 -- name: vo.cite.gr - auth: - project_id: cf702115862145869d78aadab4021f81 -- name: vo.openrdm.eu - auth: - project_id: 270eaf591c4b489a8f6dc1400fe2ed3c -- name: peachnote.com - auth: - project_id: 27f37f6027eb490f9d4994b57e08054e + - name: fedcloud.egi.eu + auth: + project_id: 84ef898d6bdc4d01aaabdf1dda2ca791 + - name: vo.panosc.eu + auth: + project_id: ac06d127fc14463c9bd283f08e731eb2 + - name: vo.cite.gr + auth: + project_id: cf702115862145869d78aadab4021f81 + - name: vo.openrdm.eu + auth: + project_id: 270eaf591c4b489a8f6dc1400fe2ed3c + - name: peachnote.com + auth: + project_id: 27f37f6027eb490f9d4994b57e08054e diff --git a/sites/ELKH-CLOUD.yaml b/sites/ELKH-CLOUD.yaml index 0efce5e2..29436695 100644 --- a/sites/ELKH-CLOUD.yaml +++ b/sites/ELKH-CLOUD.yaml @@ -1,10 +1,10 @@ --- -gocdb: ELKH-CLOUD +gocdb: ELKH-CLOUD endpoint: https://sztaki.science-cloud.hu:5000/v3 vos: -- name: ops - auth: - project_id: 6141a6ee30004094b4e9e53913a8e399 -- name: vo.ai4publicpolicy.eu - auth: - project_id: e3a1a579887d4fc8b840a0d13188f0ea + - name: ops + auth: + project_id: 6141a6ee30004094b4e9e53913a8e399 + - name: vo.ai4publicpolicy.eu + auth: + project_id: e3a1a579887d4fc8b840a0d13188f0ea diff --git a/sites/EODC.yaml b/sites/EODC.yaml index 4f64a48d..d8ecee0a 100644 --- a/sites/EODC.yaml +++ b/sites/EODC.yaml @@ -2,9 +2,9 @@ gocdb: EODC endpoint: https://cloud.eodc.eu:5000/v3/ vos: -- name: eval.c-scale.eu - auth: - project_id: 9197366d7240406c9fcb7431bee8e569 -- name: ops - auth: - project_id: 9197366d7240406c9fcb7431bee8e569 + - name: eval.c-scale.eu + auth: + project_id: 9197366d7240406c9fcb7431bee8e569 + - name: ops + auth: + project_id: 9197366d7240406c9fcb7431bee8e569 diff --git a/sites/GRNET-OPENSTACK.yaml b/sites/GRNET-OPENSTACK.yaml index 64ac339d..1278871e 100644 --- a/sites/GRNET-OPENSTACK.yaml +++ b/sites/GRNET-OPENSTACK.yaml @@ -7,6 +7,6 @@ images: - qcow2 - raw vos: -- name: ops - auth: - project_id: fd88c4b7bf9242fdbde17b484ccdb032 + - name: ops + auth: + project_id: fd88c4b7bf9242fdbde17b484ccdb032 diff --git a/sites/IFCA-LCG2.yaml b/sites/IFCA-LCG2.yaml index d82bbd11..41d56992 100644 --- a/sites/IFCA-LCG2.yaml +++ b/sites/IFCA-LCG2.yaml @@ -2,61 +2,61 @@ gocdb: IFCA-LCG2 endpoint: https://api.cloud.ifca.es:5000/v3/ vos: -- name: cos4cloud-eosc.eu - auth: - project_id: c614975f1176494eaf6d6c389e1f3e2c -- name: cryoem.instruct-eric.eu - auth: - project_id: c7db08b907ef4f0fae73bdd6587bc79e -- name: demo.fedcloud.egi.eu - auth: - project_id: 2a7e2cd4b6dc4e609dd934964c1715c6 -- name: dteam - auth: - project_id: 5eb8959a799240a98f4f303f5fbd80be -#This is not an EGI VO -#- name: ec-meloa.eu -# auth: -# project_id: 6b8f8974b27247adb4cc2990b81e6019 -- name: enmr.eu - auth: - project_id: b6b1c395b7da4e8aa1d0895bd695b0ba -- name: icecube - auth: - project_id: 36a6b6937b4d4d23a74842791d5c6e9a -- name: opencoast.eosc-hub.eu - auth: - project_id: 4ebc1727dbed465c8ef72617a9075b4f -- name: openrisknet.org - auth: - project_id: 6f17d8db2b07472dacf01c453753c3a8 -- name: ops - auth: - project_id: a372c1e2fba040e58fd0cb524a3ccd34 -- name: training.egi.eu - auth: - project_id: f1d0308880134d04964097524eace710 -- name: vo.access.egi.eu - auth: - project_id: 999f045cb1ff4684a15ebb338af69460 -- name: vo.ai4eosc.eu - auth: - project_id: f44e296a9ea441548456d25fb5b467c9 -- name: vo.imagine-ai.eu - auth: - project_id: 2f9d982c4a654c38aad616f5a1f7146d -- name: vo.lifewatch.eu - auth: - project_id: 3c8d36c4136946238e82d995fd274d1c -- name: /vo.lifewatch.eu/openbiomap - auth: - project_id: ac7bc26131d248ecb6add521e648c331 -- name: vo.obsea.es - auth: - project_id: 9ce2e985504d44d5af102ad3b537ffad -- name: ispravision.vo.egi.eu - auth: - project_id: ed9a5bb0f5a5444ba2ad5cd97072a189 -- name: vo.digitbrain.eu - auth: - project_id: 3eff18b8a237407ea2ed56aa9cb5d07c + - name: cos4cloud-eosc.eu + auth: + project_id: c614975f1176494eaf6d6c389e1f3e2c + - name: cryoem.instruct-eric.eu + auth: + project_id: c7db08b907ef4f0fae73bdd6587bc79e + - name: demo.fedcloud.egi.eu + auth: + project_id: 2a7e2cd4b6dc4e609dd934964c1715c6 + - name: dteam + auth: + project_id: 5eb8959a799240a98f4f303f5fbd80be + #This is not an EGI VO + #- name: ec-meloa.eu + # auth: + # project_id: 6b8f8974b27247adb4cc2990b81e6019 + - name: enmr.eu + auth: + project_id: b6b1c395b7da4e8aa1d0895bd695b0ba + - name: icecube + auth: + project_id: 36a6b6937b4d4d23a74842791d5c6e9a + - name: opencoast.eosc-hub.eu + auth: + project_id: 4ebc1727dbed465c8ef72617a9075b4f + - name: openrisknet.org + auth: + project_id: 6f17d8db2b07472dacf01c453753c3a8 + - name: ops + auth: + project_id: a372c1e2fba040e58fd0cb524a3ccd34 + - name: training.egi.eu + auth: + project_id: f1d0308880134d04964097524eace710 + - name: vo.access.egi.eu + auth: + project_id: 999f045cb1ff4684a15ebb338af69460 + - name: vo.ai4eosc.eu + auth: + project_id: f44e296a9ea441548456d25fb5b467c9 + - name: vo.imagine-ai.eu + auth: + project_id: 2f9d982c4a654c38aad616f5a1f7146d + - name: vo.lifewatch.eu + auth: + project_id: 3c8d36c4136946238e82d995fd274d1c + - name: /vo.lifewatch.eu/openbiomap + auth: + project_id: ac7bc26131d248ecb6add521e648c331 + - name: vo.obsea.es + auth: + project_id: 9ce2e985504d44d5af102ad3b537ffad + - name: ispravision.vo.egi.eu + auth: + project_id: ed9a5bb0f5a5444ba2ad5cd97072a189 + - name: vo.digitbrain.eu + auth: + project_id: 3eff18b8a237407ea2ed56aa9cb5d07c diff --git a/sites/IISAS-FedCloud-cloud.yaml b/sites/IISAS-FedCloud-cloud.yaml index 36eaea93..04c8f282 100644 --- a/sites/IISAS-FedCloud-cloud.yaml +++ b/sites/IISAS-FedCloud-cloud.yaml @@ -2,39 +2,39 @@ gocdb: IISAS-FedCloud endpoint: https://cloud.ui.savba.sk:5000/v3/ vos: -- name: cloud.egi.eu - auth: - project_id: 982ce52d45fe4e33a1c952ab9484c711 -- name: covid19.eosc-synergy.eu - auth: - project_id: a22bbffb007745b2934bf308b0a4d186 -- name: eosc-synergy.eu - auth: - project_id: 51f736d36ce34b9ebdf196cfcabd24ee -- name: mswss.ui.savba.sk - auth: - project_id: a3684e7440aa42f287cf5e9e85ea4cae -- name: mteam.data.kit.edu - auth: - project_id: 071a2c4b52494bccbc3606d59d0e6951 -- name: ops - auth: - project_id: 06f5a36f70684fd7b27518625458b69d -- name: training.egi.eu - auth: - project_id: ba233ccdb3a84ecb961ad340f4b34369 -- name: vo.access.egi.eu - auth: - project_id: 71dc9c3785cc4876bfb1a4bfc681e0f3 -- name: vo.bd4nrg.eu - auth: - project_id: 74128e581e6941ad91c7fce06f14e6c8 -- name: vo.oipub.com - auth: - project_id: e188494f39564812987a4ee5f58084a7 -- name: vo.ai4eosc.eu - auth: - project_id: 4d40037774784f22907d537070e85f42 -- name: vo.usegalaxy.eu - auth: - project_id: 7a23c4fa956a499c854eb215f3a95218 + - name: cloud.egi.eu + auth: + project_id: 982ce52d45fe4e33a1c952ab9484c711 + - name: covid19.eosc-synergy.eu + auth: + project_id: a22bbffb007745b2934bf308b0a4d186 + - name: eosc-synergy.eu + auth: + project_id: 51f736d36ce34b9ebdf196cfcabd24ee + - name: mswss.ui.savba.sk + auth: + project_id: a3684e7440aa42f287cf5e9e85ea4cae + - name: mteam.data.kit.edu + auth: + project_id: 071a2c4b52494bccbc3606d59d0e6951 + - name: ops + auth: + project_id: 06f5a36f70684fd7b27518625458b69d + - name: training.egi.eu + auth: + project_id: ba233ccdb3a84ecb961ad340f4b34369 + - name: vo.access.egi.eu + auth: + project_id: 71dc9c3785cc4876bfb1a4bfc681e0f3 + - name: vo.bd4nrg.eu + auth: + project_id: 74128e581e6941ad91c7fce06f14e6c8 + - name: vo.oipub.com + auth: + project_id: e188494f39564812987a4ee5f58084a7 + - name: vo.ai4eosc.eu + auth: + project_id: 4d40037774784f22907d537070e85f42 + - name: vo.usegalaxy.eu + auth: + project_id: 7a23c4fa956a499c854eb215f3a95218 diff --git a/sites/ILIFU-UCT.yaml b/sites/ILIFU-UCT.yaml index 5738656d..4f513ad7 100644 --- a/sites/ILIFU-UCT.yaml +++ b/sites/ILIFU-UCT.yaml @@ -6,12 +6,12 @@ images: - qcow2 - raw vos: -- name: ops - auth: - project_id: a58fbeafef824d3ebf1bef56c09dabdc -- name: vo.access.egi.eu - auth: - project_id: 538c9d147eef45f0ae3489ff84820ff2 -- name: vo.mightee.idia.za - auth: - project_id: 3121e1c5bd6249e0b6ff5dfbda1952fa + - name: ops + auth: + project_id: a58fbeafef824d3ebf1bef56c09dabdc + - name: vo.access.egi.eu + auth: + project_id: 538c9d147eef45f0ae3489ff84820ff2 + - name: vo.mightee.idia.za + auth: + project_id: 3121e1c5bd6249e0b6ff5dfbda1952fa diff --git a/sites/IN2P3-IRES.yaml b/sites/IN2P3-IRES.yaml index f3906d11..7f2b4938 100644 --- a/sites/IN2P3-IRES.yaml +++ b/sites/IN2P3-IRES.yaml @@ -2,54 +2,54 @@ gocdb: IN2P3-IRES endpoint: https://sbgcloud.in2p3.fr:5000/v3 vos: -- name: belle - auth: - project_id: e5258170eee8429da316e6a710f6d185 -- name: bioisi - auth: - project_id: bf15d4331f3d4c3997e17c0740930e8c -- name: biomed - auth: - project_id: 3a43bcf92f954d79ac1dcf07c5833e49 -- name: cms - auth: - project_id: 187caf7c40a2463390b59b3970f2048d -- name: dteam - auth: - project_id: 2490c27604904357b9e50c5e77aaeedf -- name: fedcloud.egi.eu - auth: - project_id: a5eb30bba2c2497b90645fb199e34b39 -- name: med.semmelweis-univ.hu - auth: - project_id: 8bea7dbd202f4cbcafb7e00334f320f2 -- name: ops - auth: - project_id: 929ff81c495b4cafb02fa1b8eef032c8 -- name: vo.access.egi.eu - auth: - project_id: 7a91022b9ae74ed9ac1a574972a79499 -- name: vo.elixir-europe.org - auth: - project_id: 2dfd063612f14a84989496e1a8ac080e -- name: vo.emphasisproject.eu - auth: - project_id: 3232754379c3469c9e8dbe8f403a8835 -- name: vo.europlanet-vespa.eu - auth: - project_id: c8005e7c85ca4929bde70882ae1ec137 -- name: vo.nbis.se - auth: - project_id: b822cf1f1c24427599ccb6bbe6266ae7 -- name: vo.operas-eu.org - auth: - project_id: bc4fed7e87514dd884924c77cad714bc -- name: vo.lethe-project.eu - auth: - project_id: f064d2b5f42a4704958f3bfbff7404bd -- name: saps-vo.i3m.upv.es - auth: - project_id: 96709738ce5a4439a0e14a77db9d3882 -- name: vo.pithia.eu - auth: - project_id: 7408db293bcd473a98e44924263f1190 + - name: belle + auth: + project_id: e5258170eee8429da316e6a710f6d185 + - name: bioisi + auth: + project_id: bf15d4331f3d4c3997e17c0740930e8c + - name: biomed + auth: + project_id: 3a43bcf92f954d79ac1dcf07c5833e49 + - name: cms + auth: + project_id: 187caf7c40a2463390b59b3970f2048d + - name: dteam + auth: + project_id: 2490c27604904357b9e50c5e77aaeedf + - name: fedcloud.egi.eu + auth: + project_id: a5eb30bba2c2497b90645fb199e34b39 + - name: med.semmelweis-univ.hu + auth: + project_id: 8bea7dbd202f4cbcafb7e00334f320f2 + - name: ops + auth: + project_id: 929ff81c495b4cafb02fa1b8eef032c8 + - name: vo.access.egi.eu + auth: + project_id: 7a91022b9ae74ed9ac1a574972a79499 + - name: vo.elixir-europe.org + auth: + project_id: 2dfd063612f14a84989496e1a8ac080e + - name: vo.emphasisproject.eu + auth: + project_id: 3232754379c3469c9e8dbe8f403a8835 + - name: vo.europlanet-vespa.eu + auth: + project_id: c8005e7c85ca4929bde70882ae1ec137 + - name: vo.nbis.se + auth: + project_id: b822cf1f1c24427599ccb6bbe6266ae7 + - name: vo.operas-eu.org + auth: + project_id: bc4fed7e87514dd884924c77cad714bc + - name: vo.lethe-project.eu + auth: + project_id: f064d2b5f42a4704958f3bfbff7404bd + - name: saps-vo.i3m.upv.es + auth: + project_id: 96709738ce5a4439a0e14a77db9d3882 + - name: vo.pithia.eu + auth: + project_id: 7408db293bcd473a98e44924263f1190 diff --git a/sites/INFN-CLOUD-BARI.yaml b/sites/INFN-CLOUD-BARI.yaml index d1cd3b1e..3cf0cb78 100644 --- a/sites/INFN-CLOUD-BARI.yaml +++ b/sites/INFN-CLOUD-BARI.yaml @@ -3,21 +3,21 @@ gocdb: INFN-CLOUD-BARI endpoint: https://keystone.recas.ba.infn.it/v3 protocol: openid vos: -- name: ops - auth: - project_id: 690609ffff9a42ed96b42b4b745b9e5d -- name: vo.emso-eric.eu - auth: - project_id: 18ef543d904b441cbb9c5f2302dbd154 -- name: vo.decido-project.eu - auth: - project_id: 9ca3e35cbd1b4b3f8c7676908dc10b78 -- name: vo.usegalaxy.eu - auth: - project_id: b82b6407118642d0af8ae32235ba974e -- name: vo.nbis.se - auth: - project_id: 779d51b021904fe990913cc0bf738031 -- name: vo.binare-oy.eu - auth: - project_id: f08cb68480de4ac38dbe3cf63e42bf38 + - name: ops + auth: + project_id: 690609ffff9a42ed96b42b4b745b9e5d + - name: vo.emso-eric.eu + auth: + project_id: 18ef543d904b441cbb9c5f2302dbd154 + - name: vo.decido-project.eu + auth: + project_id: 9ca3e35cbd1b4b3f8c7676908dc10b78 + - name: vo.usegalaxy.eu + auth: + project_id: b82b6407118642d0af8ae32235ba974e + - name: vo.nbis.se + auth: + project_id: 779d51b021904fe990913cc0bf738031 + - name: vo.binare-oy.eu + auth: + project_id: f08cb68480de4ac38dbe3cf63e42bf38 diff --git a/sites/INFN-CLOUD-CNAF.yaml b/sites/INFN-CLOUD-CNAF.yaml index 3edab7e7..04ee2ffc 100644 --- a/sites/INFN-CLOUD-CNAF.yaml +++ b/sites/INFN-CLOUD-CNAF.yaml @@ -3,18 +3,18 @@ gocdb: INFN-CLOUD-CNAF endpoint: https://cloud-api-pub.cr.cnaf.infn.it:5000/v3 region: sdds vos: -- name: dteam - auth: - project_id: a8af02aad2894e9e8b5d4775c9736b8a -- name: fedcloud.egi.eu - auth: - project_id: a8af02aad2894e9e8b5d4775c9736b8a -- name: fermi-lat.infn.it - auth: - project_id: d20b02f7f6254acab37b29a0e74015c2 -- name: ops - auth: - project_id: 8b6a8afe225344dea808ec17a26de56d -- name: vo.projectescape.eu - auth: - project_id: 1f3ff0902d554384a5af936e6643695f + - name: dteam + auth: + project_id: a8af02aad2894e9e8b5d4775c9736b8a + - name: fedcloud.egi.eu + auth: + project_id: a8af02aad2894e9e8b5d4775c9736b8a + - name: fermi-lat.infn.it + auth: + project_id: d20b02f7f6254acab37b29a0e74015c2 + - name: ops + auth: + project_id: 8b6a8afe225344dea808ec17a26de56d + - name: vo.projectescape.eu + auth: + project_id: 1f3ff0902d554384a5af936e6643695f diff --git a/sites/NCG-INGRID-PT.yaml b/sites/NCG-INGRID-PT.yaml index 501b1c5e..e35fdf5f 100644 --- a/sites/NCG-INGRID-PT.yaml +++ b/sites/NCG-INGRID-PT.yaml @@ -2,48 +2,48 @@ gocdb: NCG-INGRID-PT endpoint: https://stratus.ncg.ingrid.pt:5000/v3 vos: -- name: aquamonitor.c-scale.eu - auth: - project_id: 8258f24c93b14473ba58892f5f2748f4 -- name: bioisi - auth: - project_id: fa764d911b1d4e5eab8e51a186d813ee -- name: cloud.egi.eu - auth: - project_id: 6b042927bcfa466cb9eb56d3ea679987 -- name: dev.intertwin.eu - auth: - project_id: 7e08ed7db02847a1858ce8ed0f93be3c -- name: eosc-synergy.eu - auth: - project_id: ddf0c468c8af4e0bbb9808bfc0288381 -- name: fedcloud.egi.eu - auth: - project_id: bd5a81e1670b48f18af33b05512a9d77 -- name: opencoast.eosc-hub.eu - auth: - project_id: b0cea6bd85844b0693ceda70d9f94a09 -- name: ops - auth: - project_id: bd5a81e1670b48f18af33b05512a9d77 -- name: training.egi.eu - auth: - project_id: e51b8a89b30945adbf52a5d568912e4c -- name: vo.access.egi.eu - auth: - project_id: bd5a81e1670b48f18af33b05512a9d77 -- name: vo.ai4eosc.eu - auth: - project_id: c61c1bb323414a248cb142eb6183d4b2 -- name: vo.envrihub.eu - auth: - project_id: e6d00f696beb482c8d6900f8a88ddd69 -- name: vo.imagine-ai.eu - auth: - project_id: 009f77df459b4a6389910e0fb20ddcaf -- name: vo.lifewatch.eu - auth: - project_id: f0c662a2d69d4072bdd9334ff9852c2d -- name: worsica.vo.incd.pt - auth: - project_id: a53ca78c534046e5b13f4537ae698411 + - name: aquamonitor.c-scale.eu + auth: + project_id: 8258f24c93b14473ba58892f5f2748f4 + - name: bioisi + auth: + project_id: fa764d911b1d4e5eab8e51a186d813ee + - name: cloud.egi.eu + auth: + project_id: 6b042927bcfa466cb9eb56d3ea679987 + - name: dev.intertwin.eu + auth: + project_id: 7e08ed7db02847a1858ce8ed0f93be3c + - name: eosc-synergy.eu + auth: + project_id: ddf0c468c8af4e0bbb9808bfc0288381 + - name: fedcloud.egi.eu + auth: + project_id: bd5a81e1670b48f18af33b05512a9d77 + - name: opencoast.eosc-hub.eu + auth: + project_id: b0cea6bd85844b0693ceda70d9f94a09 + - name: ops + auth: + project_id: bd5a81e1670b48f18af33b05512a9d77 + - name: training.egi.eu + auth: + project_id: e51b8a89b30945adbf52a5d568912e4c + - name: vo.access.egi.eu + auth: + project_id: bd5a81e1670b48f18af33b05512a9d77 + - name: vo.ai4eosc.eu + auth: + project_id: c61c1bb323414a248cb142eb6183d4b2 + - name: vo.envrihub.eu + auth: + project_id: e6d00f696beb482c8d6900f8a88ddd69 + - name: vo.imagine-ai.eu + auth: + project_id: 009f77df459b4a6389910e0fb20ddcaf + - name: vo.lifewatch.eu + auth: + project_id: f0c662a2d69d4072bdd9334ff9852c2d + - name: worsica.vo.incd.pt + auth: + project_id: a53ca78c534046e5b13f4537ae698411 diff --git a/sites/SCAI.yaml b/sites/SCAI.yaml index db5cbad0..a45632ca 100644 --- a/sites/SCAI.yaml +++ b/sites/SCAI.yaml @@ -2,12 +2,12 @@ gocdb: SCAI endpoint: https://cloud.scai.fraunhofer.de:5000/v3 vos: -- name: ops - auth: - project_id: 7884889abbe44c43b331027fc2f39b75 -- name: vo.access.egi.eu - auth: - project_id: d12c055894f245b28c75c95e4ca78407 -- name: vo.ebrain-health.eu - auth: - project_id: 4733227537724f7aade971aedefb015a + - name: ops + auth: + project_id: 7884889abbe44c43b331027fc2f39b75 + - name: vo.access.egi.eu + auth: + project_id: d12c055894f245b28c75c95e4ca78407 + - name: vo.ebrain-health.eu + auth: + project_id: 4733227537724f7aade971aedefb015a diff --git a/sites/TR-FC1-ULAKBIM.yaml b/sites/TR-FC1-ULAKBIM.yaml index 71abb94d..f480eb8e 100644 --- a/sites/TR-FC1-ULAKBIM.yaml +++ b/sites/TR-FC1-ULAKBIM.yaml @@ -2,36 +2,36 @@ gocdb: TR-FC1-ULAKBIM endpoint: https://bulut.truba.gov.tr:5000/v3 vos: -- name: dteam - auth: - project_id: 208e4da6c3c249cdab269cb5b645cceb -- name: eiscat.se - auth: - project_id: 4b607492b48c4d9c9942ca243ae16a58 -- name: enmr.eu - auth: - project_id: 261e58163d204beb8d6ee82cca385771 -- name: fedcloud.egi.eu - auth: - project_id: c2ffb5336de9467c8a588038e2c06750 -- name: fusion - auth: - project_id: 0606cbf2743c4bbc8680227247f4d616 -- name: ops - auth: - project_id: 64abd71f8a1e42b6a3be1d1a172d96b6 -- name: vo.access.egi.eu - auth: - project_id: 2fa316a05d364de9b5a55ac78a45f8bf -- name: vo.enes.org - auth: - project_id: a59bd0a9ed754941962846c4a081d6ca -- name: vo.nbis.se - auth: - project_id: b0159e11cb4b470eba90d113593e90c9 -- name: vo.imagine-ai.eu - auth: - project_id: 3c1f7074ad974024849cfd01a4b3858d -- name: vo.usegalaxy.eu - auth: - project_id: 5eef96ac9de4417aa50395a12d793b48 + - name: dteam + auth: + project_id: 208e4da6c3c249cdab269cb5b645cceb + - name: eiscat.se + auth: + project_id: 4b607492b48c4d9c9942ca243ae16a58 + - name: enmr.eu + auth: + project_id: 261e58163d204beb8d6ee82cca385771 + - name: fedcloud.egi.eu + auth: + project_id: c2ffb5336de9467c8a588038e2c06750 + - name: fusion + auth: + project_id: 0606cbf2743c4bbc8680227247f4d616 + - name: ops + auth: + project_id: 64abd71f8a1e42b6a3be1d1a172d96b6 + - name: vo.access.egi.eu + auth: + project_id: 2fa316a05d364de9b5a55ac78a45f8bf + - name: vo.enes.org + auth: + project_id: a59bd0a9ed754941962846c4a081d6ca + - name: vo.nbis.se + auth: + project_id: b0159e11cb4b470eba90d113593e90c9 + - name: vo.imagine-ai.eu + auth: + project_id: 3c1f7074ad974024849cfd01a4b3858d + - name: vo.usegalaxy.eu + auth: + project_id: 5eef96ac9de4417aa50395a12d793b48 diff --git a/sites/UA-BITP.yaml b/sites/UA-BITP.yaml index 27982ced..56eb888b 100644 --- a/sites/UA-BITP.yaml +++ b/sites/UA-BITP.yaml @@ -2,15 +2,15 @@ gocdb: UA-BITP endpoint: https://openstack.bitp.kiev.ua:5000/v3 vos: -- name: dteam - auth: - project_id: 1305de6b15384e0c8d77251ab6f703af -- name: fedcloud.egi.eu - auth: - project_id: 8d48556b378549a3a3f02ce933096c1f -- name: ops - auth: - project_id: ea6e7637552d476d8247b5d42a07df7d -- name: vo.access.egi.eu - auth: - project_id: 8d48556b378549a3a3f02ce933096c1f + - name: dteam + auth: + project_id: 1305de6b15384e0c8d77251ab6f703af + - name: fedcloud.egi.eu + auth: + project_id: 8d48556b378549a3a3f02ce933096c1f + - name: ops + auth: + project_id: ea6e7637552d476d8247b5d42a07df7d + - name: vo.access.egi.eu + auth: + project_id: 8d48556b378549a3a3f02ce933096c1f diff --git a/sites/WALTON-CLOUD.yaml b/sites/WALTON-CLOUD.yaml index 9c7138e2..b04556d2 100644 --- a/sites/WALTON-CLOUD.yaml +++ b/sites/WALTON-CLOUD.yaml @@ -1,16 +1,16 @@ --- -gocdb: WALTON-CLOUD +gocdb: WALTON-CLOUD endpoint: https://horizon.waltoncloud.eu:5000/v3 vos: -- name: ops - auth: - project_id: 786ae008b6694cfca45e04001fe2054c -- name: vo.eurosea.marine.ie - auth: - project_id: 30e1e1ad790043108f18a627474296df -- name: vo.access.egi.eu - auth: - project_id: 18f97f15a8374f5eb7e8cc0258eace99 -- name: vo.imagine-ai.eu - auth: - project_id: 08c98a7449444c7a8103eb7521b82dfa + - name: ops + auth: + project_id: 786ae008b6694cfca45e04001fe2054c + - name: vo.eurosea.marine.ie + auth: + project_id: 30e1e1ad790043108f18a627474296df + - name: vo.access.egi.eu + auth: + project_id: 18f97f15a8374f5eb7e8cc0258eace99 + - name: vo.imagine-ai.eu + auth: + project_id: 08c98a7449444c7a8103eb7521b82dfa diff --git a/sites/fedcloud.srce.hr.yaml b/sites/fedcloud.srce.hr.yaml index 9f1aa6d9..0f10e057 100644 --- a/sites/fedcloud.srce.hr.yaml +++ b/sites/fedcloud.srce.hr.yaml @@ -2,12 +2,12 @@ gocdb: fedcloud.srce.hr endpoint: https://cloud.cro-ngi.hr:5000/v3/ vos: -- name: dteam - auth: - project_id: 8fbe7b83bfa7420ea75bbceb761ad079 -- name: fedcloud.egi.eu - auth: - project_id: 662f67f51f4c451987e62b17820a2bc5 -- name: ops - auth: - project_id: 949f4fe468164de9a8afdf03e70a6fc0 + - name: dteam + auth: + project_id: 8fbe7b83bfa7420ea75bbceb761ad079 + - name: fedcloud.egi.eu + auth: + project_id: 662f67f51f4c451987e62b17820a2bc5 + - name: ops + auth: + project_id: 949f4fe468164de9a8afdf03e70a6fc0 diff --git a/vo-mappings.yaml b/vo-mappings.yaml index f27b01a4..8fcc1be4 100644 --- a/vo-mappings.yaml +++ b/vo-mappings.yaml @@ -12,7 +12,7 @@ vos: covid19.eosc-synergy.eu: "urn:mace:egi.eu:group:covid19.eosc-synergy.eu:role=vm_operator#aai.egi.eu" cos4cloud-eosc.eu: "urn:mace:egi.eu:group:cos4cloud-eosc.eu:role=vm_operator#aai.egi.eu" cryoem.instruct-eric.eu: "urn:mace:egi.eu:group:cryoem.instruct-eric.eu:role=vm_operator#aai.egi.eu" - culturalheritage.vo.egi.eu: "urn:mace:egi.eu:group:culturalheritage.vo.egi.eu:CH-cloud_operators:role=member#aai.egi.eu" + culturalheritage.vo.egi.eu: "urn:mace:egi.eu:group:culturalheritage.vo.egi.eu:CH-cloud_operators:role=member#aai.egi.eu" d4science.org: "urn:mace:egi.eu:group:d4science.org:role=vm_operator#aai.egi.eu" demo.fedcloud.egi.eu: "urn:mace:egi.eu:group:demo.fedcloud.egi.eu:vm_operator:role=member#aai.egi.eu" drihm.eu: "urn:mace:egi.eu:group:drihm.eu:role=vm_operator#aai.egi.eu"