--- a/components/openstack/keystone/keystone.p5m Wed May 27 05:22:49 2015 -0700
+++ b/components/openstack/keystone/keystone.p5m Wed May 27 15:21:04 2015 -0600
@@ -69,7 +69,8 @@
file path=lib/svc/manifest/application/openstack/keystone-upgrade.xml
file path=lib/svc/manifest/application/openstack/keystone.xml
file files/keystone path=lib/svc/method/keystone
-file files/keystone-upgrade path=lib/svc/method/keystone-upgrade
+file files/keystone-upgrade path=lib/svc/method/keystone-upgrade \
+ pkg.depend.bypass-generate=.*/openstack_common.*
file path=usr/bin/keystone-manage
file tools/sample_data.sh path=usr/demo/openstack/keystone/sample_data.sh \
mode=0555
@@ -395,12 +396,50 @@
# force a dependency on package delivering openssl(1OPENSSL)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/openssl
+# 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)
# 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 eventlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/eventlet-$(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 passlib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/passlib-$(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 python-ldap; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/python-ldap-$(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 webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/webob-$(PYV)
+
# force a dependency on dogpile.cache; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/dogpile.cache-$(PYV)
@@ -409,18 +448,9 @@
# out.
depend type=require fmri=library/python/dogpile.core-$(PYV)
-# force a dependency on eventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/eventlet-$(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 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)
@@ -432,9 +462,6 @@
# force a dependency on ldappool; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/ldappool-$(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 oauthlib; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oauthlib-$(PYV)
@@ -451,34 +478,12 @@
# 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 passlib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/passlib-$(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 pycadf; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pycadf-$(PYV)
-# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/python-ldap-$(PYV)
-
# force a dependency on python-memcached; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/python-memcached-$(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 webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)