specify volume device paths in full

Author: sjpb

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

@@ -114,11 +114,11 @@ resource "openstack_compute_instance_v2" "control" {
     fs_setup:
       - label: state
         filesystem: ext4
-        device: /dev/${var.block_device_prefix}b
+        device: ${var.state_volume_device_path}
         partition: auto
       - label: home
         filesystem: ext4
-        device: /dev/${var.block_device_prefix}c
+        device: ${var.home_volume_device_path}
         partition: auto
 
     mounts:

environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf

@@ -49,10 +49,16 @@ variable "environment_root" {
     description = "Path to environment root, automatically set by activate script"
 }
 
-variable "block_device_prefix" {
+variable "state_volume_device_path" {
     type = string
-    description = "Prefix for block device names"
-    default = "sd"
+    description = "Path to block device for state"
+    default = "/dev/sdb"
+}
+
+variable "home_volume_device_path" {
+    type = string
+    description = "Path to block device name for home directories"
+    default = "/dev/sdc"
 }
 
 variable "state_dir" {