Skip to content

Commit ea3a2af

Browse files
committed
Use flavor_name to define control and login nodes
1 parent af8e55e commit ea3a2af

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

roles/cluster_infra/templates/resources.tf.j2

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ resource "openstack_networking_secgroup_rule_v2" "secgroup_slurm_login_rule_ingr
7676
resource "openstack_compute_instance_v2" "login" {
7777
name = "{{ cluster_name }}-login-0"
7878
image_id = "{{ cluster_image }}"
79+
{% if login_flavor_name is defined %}
80+
flavor_name = "{{ login_flavor_name }}"
81+
{% else %}
7982
flavor_id = "{{ login_flavor }}"
83+
{% endif %}
8084

8185
network {
8286
name = "{{ cluster_network }}"
@@ -97,8 +101,12 @@ resource "openstack_compute_instance_v2" "login" {
97101
resource "openstack_compute_instance_v2" "control" {
98102
name = "{{ cluster_name }}-control-0"
99103
image_id = "{{ cluster_image }}"
100-
flavor_id = "{{ compute_flavor }}"
101-
104+
{% if control_flavor_name is defined %}
105+
flavor_name = "{{ control_flavor_name }}"
106+
{% else %}
107+
flavor_id = "{{ control_flavor }}"
108+
{% endif %}
109+
102110
network {
103111
name = "{{ cluster_network }}"
104112
}

0 commit comments

Comments
 (0)