Skip to content

Merge upstream v1.140.1 #24

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.

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

Merged
merged 7 commits into from
Feb 23, 2024
Merged

Merge upstream v1.140.1 #24

merged 7 commits into from
Feb 23, 2024

Conversation

sjpb
Copy link
Collaborator

@sjpb sjpb commented Feb 16, 2024

Merges upstream release v1.140.1.

NB: This modifies galaxy-installed roles so ./dev/setup-env.sh must be run to pull them in.

Matt Pryor and others added 7 commits January 30, 2024 13:07
* Changes to support explicit quota checks

* Add count parameter to compute flavor

---------

Co-authored-by: Steve Brasier <[email protected]>
* Remove pulling the previous image

* Simplify logic around cluster_previous_image
* add support for manila to common environment

* use manila share for /scratch in stackhpc env w/ tests

* make home volume optional in skeleton TF

* remove share creation from CI TF

* add manila UI for caas

* support manila- or nfs/volume- based home dirs in caas

* remove manila config from UI

* add optional platform-lifecycle manila share for homedirs for caas

* add home and project manila config for caas

* tweak home volume size UI description to account for shares

* fix caas manila config typo

* tidy PR diff

* bump fatimage to include manila client

* Revert commit "tweak home volume size UI description to account for shares"

This reverts commit 3d9cfbadc141654cfbbb334b82ef1415362cc16c.

* add manila UI for caas

* add defaults for new caas manila extravars, where possible

* make cluster_home_manila_share_type optional for when default share type is defined

* address review comments

* bump manila requirement after role release

* default usage of home manila share to match project share for caas

* remove caas manila-specific ui-meta
* add manila /home specific UI for Arcus

* fixup description for home share size for arcus manila-only UI
* Add requires_ssh_key:true into ui meta

* require ssh key for manila too

---------

Co-authored-by: Steve Brasier <[email protected]>
* remove mention of home share from slurm-infra UI

* add description re. /project
@sjpb sjpb changed the base branch from nrel to prod2312-fips February 16, 2024 15:19
@sjpb sjpb marked this pull request as ready for review February 16, 2024 16:24
@sjpb sjpb mentioned this pull request Feb 16, 2024
3 tasks
@sjpb sjpb changed the base branch from prod2312-fips to prod2312-merger February 23, 2024 15:26
@sjpb sjpb merged commit 95493a1 into prod2312-merger Feb 23, 2024
@sjpb sjpb mentioned this pull request Feb 23, 2024
5 tasks
@sjpb sjpb deleted the prod2312-v1.140.1 branch July 19, 2024 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants