--- a/components/openstack/glance/glance.p5m Wed May 27 05:22:49 2015 -0700
+++ b/components/openstack/glance/glance.p5m Wed May 27 15:21:04 2015 -0600
@@ -136,7 +136,8 @@
file files/glance-api path=lib/svc/method/glance-api
file files/glance-registry path=lib/svc/method/glance-registry
file files/glance-scrubber path=lib/svc/method/glance-scrubber
-file files/glance-upgrade path=lib/svc/method/glance-upgrade
+file files/glance-upgrade path=lib/svc/method/glance-upgrade \
+ pkg.depend.bypass-generate=.*/openstack_common.*
file path=usr/bin/glance-cache-manage
file path=usr/bin/glance-cache-prefetcher
file path=usr/bin/glance-manage
@@ -377,6 +378,10 @@
# flush this out.
depend type=group fmri=library/python-2/anyjson-$(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 dnspython; pkgdepend work is needed
# to flush this out.
depend type=group fmri=library/python/dnspython-$(PYV)
@@ -385,9 +390,9 @@
# to flush this out.
depend type=group fmri=library/python/pysendfile-$(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 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)
@@ -395,18 +400,43 @@
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/babel-$(PYV)
-# force a dependency on glance_store; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/glance_store-$(PYV)
-
# force a dependency on httplib2; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/httplib2-$(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 netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/netaddr-$(PYV)
+
+# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/ordereddict-$(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 pyopenssl; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/pyopenssl-$(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 stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/stevedore-$(PYV)
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/webob-$(PYV)
+
+# force a dependency on glance_store; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/glance_store-$(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 jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-$(PYV)
-
# force a dependency on keystoneclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/keystoneclient-$(PYV)
@@ -414,12 +444,6 @@
# force a dependency on keystonemiddleware; used via a paste.deploy filter
depend type=require fmri=library/python/keystonemiddleware-$(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 ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/ordereddict-$(PYV)
-
# force a dependency on oslo.db; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.db-$(PYV)
@@ -436,37 +460,18 @@
# force a dependency on osprofiler; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/osprofiler-$(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 posix_ipc; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/posix_ipc-$(PYV)
-# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyopenssl-$(PYV)
-
# force a dependency on retrying; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/retrying-$(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 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 webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)
-
# force a dependency on wsme; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/wsme-$(PYV)