--- a/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m	Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -48,17 +48,22 @@
 file path=etc/puppet/modules/keystone/checksums.json
 file path=etc/puppet/modules/keystone/examples/apache_dropin.pp
 file path=etc/puppet/modules/keystone/examples/apache_with_paths.pp
+file path=etc/puppet/modules/keystone/examples/k2k_sp_shib.pp
+file path=etc/puppet/modules/keystone/examples/ldap_backend.pp
 file path=etc/puppet/modules/keystone/examples/ldap_full.pp
 file path=etc/puppet/modules/keystone/examples/ldap_identity.pp
+file path=etc/puppet/modules/keystone/examples/user_project_user_role_composite_namevar.pp
 file path=etc/puppet/modules/keystone/examples/v3_basic.pp
+file path=etc/puppet/modules/keystone/examples/v3_domain_configuration.pp
 file path=etc/puppet/modules/keystone/ext/keystone_test.rb
 file path=etc/puppet/modules/keystone/ext/keystone_test_v3.rb
-file path=etc/puppet/modules/keystone/files/httpd/keystone.py
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone/util.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_config/ini_setting.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_domain/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_domain_config/openstack.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_identity_provider/openstack.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_paste_ini/ini_setting.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_role/openstack.rb
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_service/openstack.rb
@@ -67,23 +72,39 @@
 file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_user_role/openstack.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_config.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_domain.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_domain_config.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_endpoint.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_identity_provider.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_paste_ini.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_role.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_service.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_tenant.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user.rb
 file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user_role.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers/utilities.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/default_domain.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/read_only.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/required.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone_config/ini_setting.rb
 file path=etc/puppet/modules/keystone/manifests/client.pp
 file path=etc/puppet/modules/keystone/manifests/config.pp
 file path=etc/puppet/modules/keystone/manifests/cron/token_flush.pp
+file path=etc/puppet/modules/keystone/manifests/db.pp
 file path=etc/puppet/modules/keystone/manifests/db/mysql.pp
 file path=etc/puppet/modules/keystone/manifests/db/postgresql.pp
 file path=etc/puppet/modules/keystone/manifests/db/sync.pp
-file path=etc/puppet/modules/keystone/manifests/dev/install.pp
+file path=etc/puppet/modules/keystone/manifests/deps.pp
+file path=etc/puppet/modules/keystone/manifests/disable_admin_token_auth.pp
 file path=etc/puppet/modules/keystone/manifests/endpoint.pp
+file path=etc/puppet/modules/keystone/manifests/federation/identity_provider.pp
+file path=etc/puppet/modules/keystone/manifests/federation/mellon.pp
+file path=etc/puppet/modules/keystone/manifests/federation/shibboleth.pp
 file path=etc/puppet/modules/keystone/manifests/init.pp
 file path=etc/puppet/modules/keystone/manifests/ldap.pp
+file path=etc/puppet/modules/keystone/manifests/ldap_backend.pp
 file path=etc/puppet/modules/keystone/manifests/logging.pp
 file path=etc/puppet/modules/keystone/manifests/params.pp
 file path=etc/puppet/modules/keystone/manifests/policy.pp
@@ -94,33 +115,80 @@
 file path=etc/puppet/modules/keystone/manifests/service.pp
 file path=etc/puppet/modules/keystone/manifests/wsgi/apache.pp
 file path=etc/puppet/modules/keystone/metadata.json
-file path=etc/puppet/modules/keystone/spec/acceptance/basic_keystone_spec.rb
+file path=etc/puppet/modules/keystone/releasenotes/notes/deprecated_ldap-02957eb56827ead5.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/disable_admin_token_auth-b82d0aca80d1f091.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/ensure_parameter_service_identity_resource-610076e4902c23ec.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/federation_with_mellon-2f8229c1464b2e0e.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix-cache-configs-a3972486723f1d99.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_admin-fee6e76089c07a42.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_endpoint_region-0fa0d89061ebaf12.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_openrc_v2-64049769daf57b65.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/hash_domains-d6a867466bcf324b.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/ipv6_provider-796b60badd356e59.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone-wsgi-scripts-0d772d1f9f2d6c57.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_bootstrap-4bf00198001d3350.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_hooks_support-2c9e8b09bdbd1b5b.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_identity_provider-9b6f6b3ad70c60f3.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/manage_ldap_packages-3b739e338f3e59c2.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/multi_domain_configuration-32dc8cbef450f1d6.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/multi_ldap-975858a46dd622a6.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/os_service_default-9caeeb340d4bb303.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/policy_driver-c991dd693d2336fc.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/policy_rc_d_keystone_eventlet-2dc65eb3d27f8969.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/remove_unused_class-0615d6744896ad97.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/stop_posix_and_files-930ee921d0ebead2.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/support_multi_domain-bd04f18aa7913eaa.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/keystone/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/keystone/releasenotes/source/conf.py
+file path=etc/puppet/modules/keystone/releasenotes/source/index.rst
+file path=etc/puppet/modules/keystone/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/keystone/setup.cfg
+file path=etc/puppet/modules/keystone/setup.py
+file path=etc/puppet/modules/keystone/spec/acceptance/default_domain_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_identity_provider_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_shibboleth_spec.rb
 file path=etc/puppet/modules/keystone/spec/acceptance/keystone_wsgi_apache_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/centos-70-x64.yml
 file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/default.yml
 file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-centos7.yml
 file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 file path=etc/puppet/modules/keystone/spec/classes/keystone_client_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_cron_token_flush_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_db_mysql_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_db_postgresql_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_db_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_db_sync_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_deps_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_disable_admin_token_auth_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_endpoint_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_identity_provider_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_mellon.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_shibboleth.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_ldap_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_logging_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_policy_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_python_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_service_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_spec.rb
 file path=etc/puppet/modules/keystone/spec/classes/keystone_wsgi_apache_spec.rb
+file path=etc/puppet/modules/keystone/spec/defines/keystone_ldap_backend_spec.rb
 file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_authtoken_spec.rb
 file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_service_identity_spec.rb
 file path=etc/puppet/modules/keystone/spec/shared_examples.rb
+file path=etc/puppet/modules/keystone/spec/shared_examples_acceptance.rb
 file path=etc/puppet/modules/keystone/spec/spec.opts
 file path=etc/puppet/modules/keystone/spec/spec_helper.rb
 file path=etc/puppet/modules/keystone/spec/spec_helper_acceptance.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone/util_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_config/ini_setting_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_domain/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_domain_config/openstack_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_identity_provider/openstack_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_paste_ini/ini_setting_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
@@ -128,12 +196,20 @@
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user_role/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_config_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_domain_config_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/type/keystone_endpoint_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_identity_provider_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/type/keystone_paste_ini_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_service_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/type/keystone_tenant_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_role_spec.rb
 file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_spec.rb
+file path=etc/puppet/modules/keystone/templates/mellon.conf.erb
+file path=etc/puppet/modules/keystone/templates/shibboleth.conf.erb
+file path=etc/puppet/modules/keystone/test-requirements.txt
 file path=etc/puppet/modules/keystone/tests/site.pp
+file path=etc/puppet/modules/keystone/tox.ini
 #
 license openstack-keystone.license license="Apache v2.0"