Skip to content

Commit 673832a

Browse files
committed
Autodetect block_device_prefix from image metadata
1 parent 880d528 commit 673832a

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

group_vars/openstack.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ cluster_ssh_user: rocky
1919

2020
# Set the size of the state volume to metrics_db_maximum_size + 10
2121
state_volume_size: "{{ metrics_db_maximum_size + 10 }}"
22-
block_device_prefix: 'vd'

roles/cluster_infra/defaults/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,9 @@ cluster_groups_zenith:
5252
zenith: [grafana, openondemand]
5353

5454
cluster_deploy_ssh_keys_extra: []
55+
56+
# List of hw_scsi_models that result in block devices presenting as /dev/sdX
57+
# rather than /dev/vdX
58+
scsi_models:
59+
# Ceph [https://docs.ceph.com/en/quincy/rbd/rbd-openstack/#image-properties]
60+
- virtio-scsi

roles/cluster_infra/tasks/main.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@
5757
- terraform_state == "present"
5858
- cluster_upgrade_system_packages is not defined or not cluster_upgrade_system_packages
5959

60+
- name: Detect volume device prefix from image metadata
61+
block:
62+
- name: Get image metadata from OpenStack API
63+
openstack.cloud.image_info:
64+
image: "{{ cluster_previous_image | default(cluster_image) }}"
65+
register: cluster_image_info
66+
67+
- name: Set volume_device_prefix fact
68+
set_fact:
69+
block_device_prefix: >-
70+
{{
71+
'sd' if cluster_image_info.image.metadata.hw_scsi_model is defined and
72+
cluster_image_info.image.metadata.hw_scsi_model in scsi_models
73+
else 'vd'
74+
}}
75+
# Only run when block_device_prefix isn't set as an extravar
76+
when: block_device_prefix is not defined
77+
78+
6079
- name: Template Terraform files into project directory
6180
template:
6281
src: >-

0 commit comments

Comments
 (0)