1 files changed, 13 insertions, 1 deletions

diff --git a/release/Makefile.vm b/release/Makefile.vm
index ce7f0eab922c..0ef7fc8ef2e7 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -10,8 +10,10 @@ VMFORMATS?=	vhd vmdk qcow2 raw
 VMSIZE?=	20G
 VMBASE?=	vm
 
-CLOUDWARE?=	AZURE
+CLOUDWARE?=	AZURE \
+		OPENSTACK
 AZURE_FORMAT=	vhdf
+OPENSTACK_FORMAT=qcow2
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}
@@ -65,3 +67,13 @@ vm-azure:
 		${WORLDDIR} ${.TARGET} ${VMSIZE} ${AZUREIMAGE}
 .endif
 	touch ${.TARGET}
+
+vm-openstack:
+.if exists(${.CURDIR}/${TARGET}/mk-openstack.sh)
+	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		OPENSTACKCONF=${OPENSTACKCONF}
+		OPENSTACK_FORMAT=${OPENSTACK_FORMAT} \
+		${.CURDIR}/${TARGET}/mk-openstack.sh ${.TARGET} openstack.img \
+		${WORLDDIR} ${.TARGET} ${VMSIZE} ${OPENSTACKIMAGE}
+.endif
+	touch ${.TARGET}