--- a/components/openstack/neutron/neutron.p5m	Wed May 13 04:53:25 2015 -0700
+++ b/components/openstack/neutron/neutron.p5m	Tue May 19 13:51:17 2015 -0700
@@ -106,7 +106,8 @@
 file files/neutron-l3-agent path=lib/svc/method/neutron-l3-agent
 file files/neutron-metadata-agent path=lib/svc/method/neutron-metadata-agent
 file files/neutron-server path=lib/svc/method/neutron-server
-file files/neutron-upgrade path=lib/svc/method/neutron-upgrade
+file files/neutron-upgrade path=lib/svc/method/neutron-upgrade \
+    pkg.depend.bypass-generate=.*/openstack_common.*
 file path=usr/bin/neutron-db-manage
 file path=usr/lib/neutron/evs-neutron-migration mode=0555
 file usr/bin/neutron-dhcp-agent path=usr/lib/neutron/neutron-dhcp-agent \
@@ -1006,6 +1007,10 @@
 # force a dependency on package delivering ippool(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/ippool
 
+# force a dependency on cloud/openstack/openstack-common until it is
+# available in the WOS
+depend type=require fmri=cloud/openstack/openstack-common
+
 # force a dependency on alembic; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/alembic-$(PYV)