Skip to content

Commit a34d00a

Browse files
committed
Don't use state_volume_size group_var
1 parent 08c8a19 commit a34d00a

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

group_vars/openstack.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ terraform_project_path: "{{ playbook_dir }}/terraform"
1717
terraform_state: "{{ cluster_state | default('present') }}"
1818
cluster_ssh_user: rocky
1919

20-
state_volume_size: "{{ cluster_state_volume_size }}"
21-
2220
state_volume_device_path: "{{ cluster_state_volume_device_path | default('/dev/vdb') }}"
2321
home_volume_device_path: "{{ cluster_home_volume_device_path | default('/dev/vdc') }}"

group_vars/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ openondemand_address: "{{ hostvars[groups['openondemand'].0].api_address if 'ope
88
prometheus_scrape_configs: "{{ prometheus_scrape_configs_default + (openondemand_scrape_configs if ( 'openondemand' in groups ) else [] ) }}"
99

1010
# Fix Prometheus storage retention size to 80% of state volume size
11-
prometheus_storage_retention_size: "{{ ( 0.8 * ( hostvars[groups['openstack']].state_volume_size | int ) ) | int ~ 'GB' }}"
11+
prometheus_storage_retention_size: "{{ ( 0.8 * ( cluster_state_volume_size | int ) ) | int ~ 'GB' }}"

roles/cluster_infra/templates/resources.tf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ resource "openstack_networking_secgroup_rule_v2" "secgroup_slurm_login_rule_ingr
7575
resource "openstack_blockstorage_volume_v3" "state" {
7676
name = "{{ cluster_name }}-state"
7777
description = "State for control node"
78-
size = "{{ state_volume_size }}"
78+
size = "{{ cluster_state_volume_size }}"
7979
}
8080

8181
resource "openstack_blockstorage_volume_v3" "home" {

0 commit comments

Comments
 (0)