--- a/components/openstack/nova/nova.p5m Wed May 27 05:22:49 2015 -0700
+++ b/components/openstack/nova/nova.p5m Wed May 27 15:21:04 2015 -0600
@@ -83,7 +83,8 @@
file files/nova-novncproxy path=lib/svc/method/nova-novncproxy
file files/nova-objectstore path=lib/svc/method/nova-objectstore
file files/nova-scheduler path=lib/svc/method/nova-scheduler
-file files/nova-upgrade path=lib/svc/method/nova-upgrade
+file files/nova-upgrade path=lib/svc/method/nova-upgrade \
+ pkg.depend.bypass-generate=.*/openstack_common.*
file files/zone-vnc-console path=lib/svc/method/zone-vnc-console
file path=usr/bin/nova-manage
file usr/bin/nova-api-ec2 path=usr/lib/nova/nova-api-ec2 mode=0555
@@ -881,14 +882,14 @@
# to flush this out.
depend type=group fmri=library/python-2/python-ldap-$(PYV)
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/simplejson-$(PYV)
+
# force a group dependency on the optional python-memcached; pkgdepend work is
# needed to flush this out.
depend type=group fmri=library/python/python-memcached-$(PYV)
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
-
# force a group dependency on package delivering the optional solaris(5) brand
depend type=group fmri=system/zones/brand/brand-solaris
@@ -918,6 +919,10 @@
depend type=require fmri=__TBD \
pkg.debug.depend.file=usr/share/novnc/vnc_auto.html
+# 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 argparse; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/argparse-$(PYV)
@@ -927,38 +932,60 @@
# force a dependency on boto; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/boto-$(PYV)
+# force a dependency on decorator; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/decorator-$(PYV)
+
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/greenlet-$(PYV)
+
+# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/jsonschema-$(PYV)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/lxml-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/netaddr-$(PYV)
+
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/paste-$(PYV)
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python-2/paste.deploy-$(PYV)
+
+# force a dependency on pyasn1; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/pyasn1-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/requests-$(PYV)
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/routes-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/setuptools-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/stevedore-$(PYV)
+
# force a dependency on cinderclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/cinderclient-$(PYV)
-# force a dependency on decorator; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/decorator-$(PYV)
-
# force a dependency on glanceclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/glanceclient-$(PYV)
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-$(PYV)
-
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
# force a dependency on jinja2; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/jinja2-$(PYV)
-# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-$(PYV)
-
# force a dependency on keystonemiddleware; used via a paste.deploy filter
depend type=require fmri=library/python/keystonemiddleware-$(PYV)
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
-
# force a dependency on neutronclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/neutronclient-$(PYV)
@@ -976,37 +1003,15 @@
# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.utils-$(PYV)
-# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-$(PYV)
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-$(PYV)
-
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
-# force a dependency on pyasn1; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyasn1-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
# force a dependency on rfc3986; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/rfc3986-$(PYV)
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-$(PYV)
-
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
-
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
-
# force a dependency on websockify; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/websockify-$(PYV)