Index: py-glance-store/Makefile
===================================================================
--- py-glance-store/Makefile	(revision 481910)
+++ py-glance-store/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	glance-store
-PORTVERSION=	0.20.0
-PORTREVISION=	1
+PORTVERSION=	0.23.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,25 +14,46 @@
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PY_ENUM34} \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+		${PY_ENUM34}
 
 USES=		python shebangfix
-USE_PYTHON=	autoplist distutils
-NO_ARCH=	yes
+USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_FILES=	glance_store/tests/functional/hooks/post_test_hook.sh \
 		glance_store/tests/functional/hooks/gate_hook.sh
 
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=		CINDER VMWARE
+OPTIONS_DEFAULT=	CINDER VMWARE
+
+CINDER_DESC=	Storage backend for OpenStack Cinder storage nodes
+VMWARE_DESC=	Storage backend for VMware Datastore
+
+CINDER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-cinderclient>=3.3.0:net/py-python-cinderclient@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}os-brick>=2.2.0:devel/py-os-brick@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.8.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR}
+VMWARE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.17.0:devel/py-oslo.vmware@${PY_FLAVOR}
+
+post-patch:
+	@${REINPLACE_CMD} -Ee 's,(/etc/)(ceph|glance|ssl),${PREFIX}\1\2,g' \
+		${WRKSRC}/glance_store/_drivers/cinder.py \
+		${WRKSRC}/glance_store/_drivers/rbd.py \
+		${WRKSRC}/glance_store/_drivers/swift/store.py \
+		${WRKSRC}/glance_store/_drivers/vmware_datastore.py \
+		${WRKSRC}/glance_store/tests/unit/test_cinder_store.py
+
 .include <bsd.port.mk>
Index: py-glance-store/distinfo
===================================================================
--- py-glance-store/distinfo	(revision 481910)
+++ py-glance-store/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485277530
-SHA256 (glance_store-0.20.0.tar.gz) = 9109738038f22fc229eb83698251c7d3086cf227922e7e3625d8d204986d818c
-SIZE (glance_store-0.20.0.tar.gz) = 129769
+TIMESTAMP = 1531305299
+SHA256 (glance_store-0.23.0.tar.gz) = dc15c2ddd549feb112dffc7f21318ec3dcbcd7e3aab8169d75ddc2cceb14b6b9
+SIZE (glance_store-0.23.0.tar.gz) = 140917