Skip to content

Commit bcb4a91

Browse files
sd109sd109
andauthored
Remove unused Slurm appliance flavor vars (azimuth-cloud#123)
Co-authored-by: sd109 <[email protected]>
1 parent a6158c9 commit bcb4a91

File tree

4 files changed

+1
-27
lines changed

4 files changed

+1
-27
lines changed

.github/environments/arcus/inventory/group_vars/all/variables.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ infra_fixed_floatingip: "{{ lookup('env', 'INGRESS_IP') }}"
1010
# Flavor auto-detection picks the wrong flavors on Arcus, so override them
1111
# The flavor to use for the Azimuth AIO VM (vm.ska.cpu.general.eighth)
1212
infra_flavor_id: 5f9def81-c93f-4c1f-a521-3b810061ff6c
13-
# The flavors to use for the Slurm login and control nodes
14-
# TODO(mkjpryor) remove these once azimuth-ops has been updated
15-
azimuth_caas_stackhpc_slurm_appliance_login_flavor_name: vm.ska.cpu.general.small
16-
azimuth_caas_stackhpc_slurm_appliance_control_flavor_name: "{{ azimuth_caas_stackhpc_slurm_appliance_login_flavor_name }}"
1713
# The flavor to use for the workstation test case (vm.ska.cpu.general.small)
1814
generate_tests_caas_test_case_workstation_param_cluster_flavor: c8b72062-5d52-4590-9d7a-68a670b44442
1915
# The flavor to use for the repo2docker test case

docs/deployment/automation.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ mixin environments):
149149
infra_external_network_id: "<network id>"
150150
infra_flavor_id: "<flavor id>"
151151

152-
# CaaS configuration
153-
azimuth_caas_stackhpc_slurm_appliance_login_flavor_name: "<flavor name>"
154-
azimuth_caas_stackhpc_slurm_appliance_control_flavor_name: "<flavor name>"
155-
156152
# Azimuth cloud name
157153
# This can use the environment name if desired, e.g.:
158154
azimuth_current_cloud_name: "{{ lookup('env', 'CI_ENVIRONMENT_SLUG') }}"
@@ -219,7 +215,7 @@ Unfortunately, this is a paid feature and the only real alternative is to use a
219215
For site-specific configuration repositories hosted on GitHub, `azimuth-config` provides two sample workflows
220216
for automated deployments to a test or staging environment
221217
([example workflow](https://github.com/stackhpc/azimuth-config/blob/stable/.github-deploy-staging.yml.sample))
222-
and manually-triggered deployment to a production environment
218+
and manually-triggered deployment to a production environment
223219
([example workflow](https://github.com/stackhpc/azimuth-config/blob/stable/.github-deploy-prod.yml.sample)).
224220
These can be used with [GitHub Actions](https://docs.github.com/en/actions) to mimic some of the GitLab
225221
functionality described above. Each sample file contains a top-level comment describing how to tailor these

environments/demo/inventory/group_vars/all/variables.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ infra_flavor_id: >-
3535
# Use the same external network as we use for the infra
3636
azimuth_capi_operator_external_network_id: "{{ infra_external_network_id }}"
3737

38-
# For Slurm, we need at least 4GB RAM
39-
# Use the same flavor for login and control nodes
40-
azimuth_caas_stackhpc_slurm_appliance_login_flavor_name: >-
41-
{{-
42-
__os_flavors |
43-
selectattr('RAM', '>=', 4096) |
44-
sort(attribute = 'RAM,Ephemeral') |
45-
first |
46-
default(undef(hint = 'Unable to determine a suitable azimuth_caas_stackhpc_slurm_appliance_login_flavor_name')) |
47-
json_query('Name')
48-
}}
49-
azimuth_caas_stackhpc_slurm_appliance_control_flavor_name: >-
50-
{{- azimuth_caas_stackhpc_slurm_appliance_login_flavor_name }}
51-
5238
# Upload images as private
5339
# CaaS/Kubernetes will only work within the tenancy in which Azimuth is deployed
5440
community_images_default_visibility: private

environments/example/inventory/group_vars/all/variables.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ azimuth_authenticator_federated_provider: oidc
112112
# is the id of a Rocky 8 image that will be used for Slurm clusters
113113
# N.B. This is populated automatically using community images by default
114114
# azimuth_caas_stackhpc_slurm_appliance_image: "<image id>"
115-
# The name of the flavor to use for login nodes
116-
azimuth_caas_stackhpc_slurm_appliance_login_flavor_name: "<flavor name>"
117-
# The name of the flavor to use for control nodes
118-
azimuth_caas_stackhpc_slurm_appliance_control_flavor_name: "<flavor name>"
119115

120116
# The ID of the desktop or webconsole image to use for the workstation appliance
121117
# See https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_f0dc9cb312144d0aa44037c9149d2513/azimuth-images-prerelease/

0 commit comments

Comments
 (0)