--- a/components/openstack/keystone/keystone.p5m Wed May 13 04:53:25 2015 -0700
+++ b/components/openstack/keystone/keystone.p5m Tue May 19 13:51:17 2015 -0700
@@ -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,6 +396,10 @@
# 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/argparse-$(PYV)