Set up a VM_IMAGE_DIR environment variable to override default storage location for VMs.

Author: earlruby

README.md

@@ -82,10 +82,11 @@ documentation on for cloud-init.
 
 `create-vm` stores files as follows:
 
-* `${HOME}/vms/base/` - Place to store your base Linux cloud images.
-* `${HOME}/vms/images/` - `your-vm-name.img` and `your-vm-name-cidata.img` files.
-* `${HOME}/vms/init/` - `user-data` and `meta-data`.
-* `${HOME}/vms/xml/` - Backup copies of your VMs' XML definition files.
+* `${VM_IMAGE_DIR}` - Directory used for for VM storage. Defaults to `${HOME}/vms`.
+* `${VM_IMAGE_DIR}/base/` - Place to store your base Linux cloud images.
+* `${VM_IMAGE_DIR}/images/` - `your-vm-name.img` and `your-vm-name-cidata.img` files.
+* `${VM_IMAGE_DIR}/init/` - `user-data` and `meta-data`.
+* `${VM_IMAGE_DIR}/xml/` - Backup copies of your VMs' XML definition files.
 
 QCOW2 filesystems allocate space as needed, so if you create a VM with 100GB of storage, the initial
 size of the `your-vm-name.img` and `your-vm-name-cidata.img` files is only about **700K total**. The
@@ -128,8 +129,8 @@ If you're not using Ansible just `apt-get install` the above packages.
 ## Permissions
 
 The `libvirtd` daemon runs under the `libvirt-qemu` user service account. The `libvirt-qemu` user
-must be able to read the files in `${HOME}/vms/`. If your ${HOME} directory has permissions set to
-`0x750` then `libvirt-qemu` won't be able to read the `${HOME}/vms/` directory.
+must be able to read the files in `${VM_IMAGE_DIR}`. If your ${HOME} directory has permissions set to
+`0x750` then `libvirt-qemu` won't be able to read the `${VM_IMAGE_DIR}` directory.
 
 You could open up your home directory, e.g.:
 

create-vm

@@ -14,7 +14,9 @@
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
-#   limitations under the License.
+
+# Set VM_IMAGE_DIR environment variable to override default storage location for VMs
+VM_IMAGE_DIR=${VM_IMAGE_DIR:-"${HOME}/vms"}
 
 HOSTNAME=
 IMG_FQN=
@@ -25,7 +27,6 @@ STORAGE=80
 BRIDGE=virbr0
 MAC=
 VERBOSE=
-VM_IMAGE_DIR="${HOME}/vms"
 
 usage()
 {
@@ -48,7 +49,7 @@ OPTIONS:
 EOF
 }
 
-while getopts "h:n:i:k:r:c:s:b:m:v:d" option; do
+while getopts "h:n:i:k:r:c:s:b:m:v" option; do
     case "${option}"
     in
         h)

delete-vm

@@ -17,7 +17,10 @@
 #   limitations under the License.
 
 VM=$1
-VM_IMAGE_DIR="${HOME}/vms"
+
+# Set VM_IMAGE_DIR environment variable to override default storage location for VMs
+VM_IMAGE_DIR=${VM_IMAGE_DIR:-"${HOME}/vms"}
+
 VM_IMAGE="${VM_IMAGE_DIR}/images/$VM.img"
 CI_IMAGE="${VM_IMAGE_DIR}/images/$VM-cidata.img"