Skip to content

Commit a3370d5

Browse files
committed
terraform: Add fixed storage pathnames for all providers
Now that all cloud providers have consistent device pathnames for the extra volumes created by terraform, we can make setting the "data" and "sparse" device names consistent as well. These symbolic constants can then be used by the volume_group and devconfig playbooks and the fstests workflow to reliably locate their block device resources on test runners in the cloud. Follow the design of the OCI provider and expose the device pathnames for the data and sparse device so these pathnames can be used reliably by other kdevops subsystems. Note that the AWS data volume default, which was hidden in the Kconfig menu, changes from "/dev/nvme1n1" to "/dev/disk/kdevops/extra-volume-00." Existing AWS configurations might break if they depend on the old pathname. Also, "make menuconfig" by itself does not change the existing value of TERRAFORM_AWS_DATA_VOLUME_DEVICE_FILE_NAME to the new string. Users must make that adjustment manually in existing defconfig files. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 0b84294 commit a3370d5

4 files changed

Lines changed: 46 additions & 8 deletions

File tree

terraform/aws/kconfigs/Kconfig.storage

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,5 +203,18 @@ config TERRAFORM_AWS_EBS_VOLUME_SIZE
203203
default 4096 if TERRAFORM_AWS_EBS_VOLUME_SIZE_4096G
204204

205205
config TERRAFORM_AWS_DATA_VOLUME_DEVICE_FILE_NAME
206-
string
207-
default "/dev/nvme1n1"
206+
string "Data volume's device file name"
207+
output yaml
208+
default "/dev/disk/kdevops/extra-volume-00"
209+
help
210+
This option sets the name of the block device on each
211+
target node that is to be used for the /data file system.
212+
213+
config TERRAFORM_AWS_SPARSE_VOLUME_DEVICE_FILE_NAME
214+
string "Sparse volume's device file name"
215+
output yaml
216+
default "/dev/disk/kdevops/extra-volume-01"
217+
help
218+
This option sets the name of the block device on each
219+
target node that can be used for the fstests sparse device
220+
tests.

terraform/azure/kconfigs/Kconfig.storage

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,18 @@ config TERRAFORM_AZURE_MANAGED_DISKS_TIER
212212
default "P50" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P50
213213

214214
config TERRAFORM_AZURE_DATA_VOLUME_DEVICE_FILE_NAME
215-
string "Device name for the /data file system"
215+
string "Data volume's device file name"
216+
output yaml
216217
default "/dev/disk/azure/scsi1/lun0"
217218
help
218-
This option sets the name of the block device on each target
219-
node that is to be used for the /data file system.
219+
This option sets the name of the block device on each
220+
target node that is to be used for the /data file system.
221+
222+
config TERRAFORM_AZURE_SPARSE_VOLUME_DEVICE_FILE_NAME
223+
string "Sparse volume's device file name"
224+
output yaml
225+
default "/dev/disk/azure/scsi1/lun1"
226+
help
227+
This option sets the name of the block device on each
228+
target node that can be used for the fstests sparse device
229+
tests.

terraform/gce/kconfigs/Kconfig.storage

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,18 @@ config TERRAFORM_GCE_DISK_THROUGHPUT
206206
depends on TERRAFORM_GCE_DISK_NEEDS_THROUGHPUT
207207

208208
config TERRAFORM_GCE_DATA_VOLUME_DEVICE_FILE_NAME
209-
string
209+
string "Data volume's device file name"
210210
output yaml
211211
default "/dev/disk/by-id/google-persistent-disk-1"
212+
help
213+
This option sets the name of the block device on each
214+
target node that is to be used for the /data file system.
215+
216+
config TERRAFORM_GCE_SPARSE_VOLUME_DEVICE_FILE_NAME
217+
string "Sparse volume's device file name"
218+
output yaml
219+
default "/dev/disk/by-id/google-persistent-disk-2"
220+
help
221+
This option sets the name of the block device on each
222+
target node that can be used for the fstests sparse device
223+
tests.

terraform/oci/kconfigs/Kconfig.storage

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,14 @@ config TERRAFORM_OCI_DATA_VOLUME_DEVICE_FILE_NAME
259259
output yaml
260260
default "/dev/oracleoci/oraclevdb"
261261
help
262-
Data volume's device file name
262+
This option sets the name of the block device on each
263+
target node that is to be used for the /data file system.
263264

264265
config TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME
265266
string "Sparse volume's device file name"
266267
output yaml
267268
default "/dev/oracleoci/oraclevdc"
268269
help
269-
Sparse volume's device file name
270+
This option sets the name of the block device on each
271+
target node that can be used for the fstests sparse device
272+
tests.

0 commit comments

Comments
 (0)