--- a/components/openstack/common/Makefile	Fri Jul 17 21:20:30 2015 -0700
+++ b/components/openstack/common/Makefile	Fri Jul 17 23:10:22 2015 -0700
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		openstack
 COMPONENT_VERSION=	2014.2.2
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/nova
 IPS_COMPONENT_VERSION=	0.$(COMPONENT_VERSION)
 
 include $(WS_MAKE_RULES)/prep.mk
@@ -36,15 +37,17 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # Used for placement of openstack_common.py
-PYTHON_VERSIONS=        2.7
-PKG_MACROS +=           PYVER=$(PYTHON_VERSIONS)
+PYTHON_VERSIONS=	2.7
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSIONS)
+PKG_MACROS +=		PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
 
 build:		FRC
 	@/bin/true
 
 install:	FRC
 	($(MKDIR) $(PROTO_DIR)$(PYTHON_LIB); \
-	    $(CP) files/openstack_common.py $(PROTO_DIR)$(PYTHON_LIB); \
+	 $(CP) files/openstack_common.py $(PROTO_DIR)$(PYTHON_LIB); \
 	 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES))
 
 download::
@@ -57,4 +60,4 @@
 
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)

--- a/components/openstack/common/openstack-common.p5m	Fri Jul 17 21:20:30 2015 -0700
+++ b/components/openstack/common/openstack-common.p5m	Fri Jul 17 23:10:22 2015 -0700
@@ -47,3 +47,14 @@
 # in-house.  No TPNO is required.
 #
 license common.license license="Apache v2.0"
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on iniparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/iniparse-$(PYV)
+
+# force a dependency on python-mysql; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/python-mysql-$(PYV)

--- a/components/openstack/nova/files/solariszones/driver.py	Fri Jul 17 21:20:30 2015 -0700
+++ b/components/openstack/nova/files/solariszones/driver.py	Fri Jul 17 23:10:22 2015 -0700
@@ -26,8 +26,8 @@
 import tempfile
 import uuid
 
-import rad.bindings.com.oracle.solaris.rad.kstat as kstat
-import rad.bindings.com.oracle.solaris.rad.zonemgr as zonemgr
+import rad.bindings.com.oracle.solaris.rad.kstat_1 as kstat
+import rad.bindings.com.oracle.solaris.rad.zonemgr_1 as zonemgr
 import rad.client
 import rad.connect
 from solaris_install.archive.checkpoints import InstantiateUnifiedArchive

--- a/components/openstack/swift/Makefile	Fri Jul 17 21:20:30 2015 -0700
+++ b/components/openstack/swift/Makefile	Fri Jul 17 23:10:22 2015 -0700
@@ -36,7 +36,7 @@
 COMPONENT_ARCHIVE_URL=	http://launchpad.net/$(COMPONENT_NAME)/$(COMPONENT_CODENAME)/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
 COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
-COMPONENT_BUG_DB=	service/swift
+COMPONENT_BUGDB=	service/swift
 
 TPNO=			21826
 
@@ -59,10 +59,10 @@
 # into the proto directory for pkgdepend(1) to find.
 #
 COMPONENT_POST_INSTALL_ACTION += \
-        ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
-         $(CP) \
-             files/swift-*.xml \
-             $(PROTO_DIR)/lib/svc/manifest/application/openstack;)
+	($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+	 $(CP) \
+	     files/swift-*.xml \
+	     $(PROTO_DIR)/lib/svc/manifest/application/openstack;)
 
 COMPONENT_TEST_DIR =	$(SOURCE_DIR)
 COMPONENT_TEST_CMD =	nosetests
@@ -78,7 +78,7 @@
 
 test:		$(TEST_NO_ARCH)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 
 REQUIRED_PACKAGES += cloud/openstack/openstack-common