Skip to content

Commit 2963d3b

Browse files
author
Matt Pryor
committed
Use named flavors
1 parent e043b30 commit 2963d3b

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ infra_fixed_floatingip:
66
capi_cluster_addons_ingress_load_balancer_ip: "{{ lookup('env', 'INGRESS_IP') }}"
77

88
# Flavor auto-detection picks the wrong flavors on Arcus, so override them
9-
# The flavor to use for the seed VM (vm.azimuth.ci.ec1.medium)
10-
infra_flavor_id: 2ef4c0c5-0fb3-457d-9573-cb62a43c34f5
9+
# The flavor to use for the seed VM
10+
infra_flavor_id: >-
11+
{{ lookup('pipe', 'openstack flavor show vm.azimuth.ci.ec1.medium -f value -c id') }}
1112
# The flavor to use for the control plane nodes
1213
capi_cluster_control_plane_flavor: vm.azimuth.ci.ec1.medium
1314
# The flavor to use for worker nodes

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ infra_network_id: "{{ lookup('pipe', 'openstack network show portal-internal -f
88
infra_fixed_floatingip: "{{ lookup('env', 'INGRESS_IP') }}"
99

1010
# Flavor auto-detection picks the wrong flavors on Arcus, so override them
11-
# The flavor to use for the Azimuth AIO VM (vm.azimuth.ci.en1.medium)
12-
infra_flavor_id: 48cccd98-c783-47b9-a429-41dedb38d5f2
13-
# The flavor to use for the workstation test case (vm.azimuth.ci.ec1.medium)
14-
generate_tests_caas_test_case_workstation_param_cluster_flavor: 2ef4c0c5-0fb3-457d-9573-cb62a43c34f5
11+
# The flavor to use for the Azimuth AIO VM
12+
infra_flavor_id: >-
13+
{{ lookup('pipe', 'openstack flavor show vm.azimuth.ci.en1.medium -f value -c id') }}
14+
# The flavor to use for the workstation test case
15+
generate_tests_caas_test_case_workstation_param_cluster_flavor: >-
16+
{{ lookup('pipe', 'openstack flavor show vm.azimuth.ci.ec1.medium -f value -c id') }}
1517
# The flavor to use for the repo2docker test case
1618
generate_tests_caas_test_case_repo2docker_param_cluster_flavor: "{{ generate_tests_caas_test_case_workstation_param_cluster_flavor }}"
1719
# The flavor to use for the R-Studio test case

0 commit comments

Comments
 (0)