--- a/components/openstack/keystone/keystone.p5m Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/keystone/keystone.p5m Fri May 20 17:42:29 2016 -0400
@@ -20,16 +20,15 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
-<transform file path=lib/svc/method/.* -> add pkg.depend.bypass-generate .*/smf_include.*>
set name=pkg.fmri \
value=pkg:/cloud/openstack/keystone@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="OpenStack Keystone (Identity Service)"
set name=pkg.description \
value="OpenStack Keystone is a service that provides Identity, Token, Catalog, and Policy services for use specifically by projects in the OpenStack family."
-set name=pkg.human-version value="Juno $(COMPONENT_VERSION)"
+set name=pkg.human-version value="Kilo $(COMPONENT_VERSION)"
set name=com.oracle.info.description \
value="Keystone, the OpenStack identity service"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -43,7 +42,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION)
set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/048 \
- value=PSARC/2014/209 value=PSARC/2015/110
+ value=PSARC/2014/209 value=PSARC/2015/110 value=PSARC/2015/535
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
dir path=etc/keystone owner=keystone group=keystone mode=0700
@@ -59,6 +58,9 @@
group=keystone mode=0644 overlay=allow preserve=renamenew
file etc/policy.v3cloudsample.json path=etc/keystone/policy.v3cloudsample.json \
owner=keystone group=keystone mode=0644 overlay=allow preserve=renamenew
+file etc/sso_callback_template.html \
+ path=etc/keystone/sso_callback_template.html owner=keystone \
+ group=keystone mode=0644 overlay=allow preserve=renamenew
file files/keystone.auth_attr \
path=etc/security/auth_attr.d/cloud:openstack:keystone group=sys
file files/keystone.exec_attr \
@@ -70,8 +72,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 \
- pkg.depend.bypass-generate=.*/openstack_common.*
+file files/keystone-upgrade path=lib/svc/method/keystone-upgrade
+file files/keystone.stencil path=lib/svc/stencils/keystone.stencil
file path=usr/bin/keystone-manage
file tools/sample_data.sh path=usr/demo/openstack/keystone/sample_data.sh \
mode=0555
@@ -87,17 +89,20 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/backends/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/backends/kvs.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/backends/ldap.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/backends/sql.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/controllers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/role_backends/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/role_backends/ldap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/role_backends/sql.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/routers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/assignment/schema.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/controllers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/plugins/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/plugins/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/plugins/external.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/plugins/mapped.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/auth/plugins/oauth1.py
@@ -148,24 +153,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/openssl.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/pemutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/router.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/serializer.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/README
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/manage.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/migrate.cfg
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/034_havana.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/035_add_compound_revoked_token_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/037_add_region_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/038_add_assignment_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/040_drop_grant_tables.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/041_add_remaining_uses_count_to_trusts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/043_fixup_region_description.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/044_service_enabled.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/044_icehouse.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/045_placeholder.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/046_placeholder.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/047_placeholder.py
@@ -177,6 +171,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/053_endpoint_to_region_association.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/054_add_actor_id_index.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/055_add_indexes_to_token_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/056_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/057_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/058_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/059_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/060_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/061_add_parent_project.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/062_drop_assignment_role_fk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/063_drop_region_auth_url.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/064_drop_user_and_group_fk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/065_add_domain_config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/066_fixup_service_name_value.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/067_drop_redundant_mysql_index.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migrate_repo/versions/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/sql/migration_helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/utils.py
@@ -186,8 +192,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/common/wsgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/config.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/access/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/access/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/admin_crud/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/admin_crud/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/ec2/__init__.py
@@ -206,6 +210,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_filter/migrate_repo/versions/002_add_endpoint_groups.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_filter/migrate_repo/versions/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_filter/routers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_filter/schema.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_policy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_policy/backends/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/endpoint_policy/backends/sql.py
@@ -236,6 +241,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/001_add_identity_provider_table.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/002_add_mapping_tables.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/003_mapping_id_nullable_false.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/004_add_remote_id_column.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/005_add_service_provider_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/006_fixup_service_provider_attributes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/007_add_remote_id_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/008_add_relay_state_to_sp.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/migrate_repo/versions/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/routers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/federation/schema.py
@@ -274,10 +284,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/simple_cert/controllers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/simple_cert/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/simple_cert/routers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/stats/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/stats/backends/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/stats/backends/kvs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/stats/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/user_crud/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/contrib/user_crud/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/controllers.py
@@ -291,10 +297,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/exception.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/hacking/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/hacking/checks.py
+link path=usr/lib/python$(PYVER)/vendor-packages/keystone/httpd/admin \
+ target=keystone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/httpd/keystone.py
+link path=usr/lib/python$(PYVER)/vendor-packages/keystone/httpd/main \
+ target=keystone.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/backends/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/backends/kvs.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/backends/ldap.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/backends/sql.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/controllers.py
@@ -315,24 +325,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/README
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/config/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/config/generator.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/_i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/eventlet_backdoor.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/excutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/fileutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/gettextutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/jsonutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/local.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/log.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/loopingcall.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/policy.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/processutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/service.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/strutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/systemd.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/threadgroup.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/timeutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/openstack/common/versionutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/policy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/policy/backends/__init__.py
@@ -342,15 +341,24 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/policy/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/policy/routers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/policy/schema.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/backends/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/backends/ldap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/backends/sql.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/config_backends/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/config_backends/sql.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/controllers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/routers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/resource/schema.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/routers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/server/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/server/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/server/eventlet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/server/wsgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/service.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/backends/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/backends/kvs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/backends/memcache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/backends/sql.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/controllers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/persistence/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/persistence/backends/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/persistence/backends/kvs.py
@@ -361,13 +369,16 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/provider.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/fernet/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/fernet/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/fernet/token_formatters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/fernet/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/pki.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/pkiz.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/providers/uuid.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/token/routers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/backends/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/backends/kvs.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/backends/sql.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/controllers.py
file path=usr/lib/python$(PYVER)/vendor-packages/keystone/trust/core.py
@@ -382,30 +393,26 @@
#
license keystone.license license="Apache v2.0"
-# force a group dependency on the optional anyjson; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/anyjson-$(PYV)
+# To upgrade to Kilo version, Juno version of the package must be on the system
+depend type=origin fmri=cloud/openstack/[email protected] root-image=true
+
+# force a dependency on package delivering httpd(8)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/apache2/2.4/bin/httpd
-# force a group dependency on the optional netaddr; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/netaddr-$(PYV)
+# force a dependency on package delivering non-FIPS mod_ssl module
+depend type=require fmri=__TBD \
+ pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_ssl.so
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
+# force a dependency on package delivering mod_wsgi module
+depend type=require fmri=__TBD \
+ pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_wsgi-$(PYVER).so
# 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)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-$(PYV)
+# force a dependency on cryptography; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/cryptography-$(PYV)
# force a dependency on dogpile.cache; pkgdepend work is needed to flush this
# out.
@@ -421,9 +428,6 @@
# force a dependency on greenlet; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/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/jsonschema-$(PYV)
@@ -438,22 +442,47 @@
# 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/lxml-$(PYV)
+# force a dependency on msgpack; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/msgpack-$(PYV)
# force a dependency on oauthlib; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oauthlib-$(PYV)
+# force a dependency on openstackclient; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/openstackclient-$(PYV)
+
+# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.concurrency-$(PYV)
+
+# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.config-$(PYV)
+
# force a dependency on oslo.db; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.db-$(PYV)
# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.i18n-$(PYV)
+# force a dependency on oslo.log; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.log-$(PYV)
+
# force a dependency on oslo.messaging; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/oslo.messaging-$(PYV)
+# force a dependency on oslo.middleware; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.middleware-$(PYV)
+
+# force a dependency on oslo.policy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.policy-$(PYV)
+
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
+
# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.utils-$(PYV)
@@ -464,6 +493,9 @@
# out.
depend type=require fmri=library/python/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 pycadf; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pycadf-$(PYV)
@@ -483,8 +515,5 @@
# 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/stevedore-$(PYV)
-
# force a dependency on webob; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/webob-$(PYV)