Change imports to reflect oslo changes.
Change imports to reflect oslo changes.
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana
Merge remote-tracking branch 'origin/master' into havana
version bump and service provider update
Merge pull request #151 from rackerjoe/master

Merged automatically by jenkins after successful build test
Added additional service types

Added Heat service type "orchestration" and "cloudformation"
which provide for the heat api for both the engine and cfn.
Use package_options on installation/upgrade
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone

Conflicts:
	metadata.rb
issue #603: better regex for monit proc matching
Set public and admin_endpoint in keystone.conf

The public_endpoint and admin_endpoint options should be set in
keystone.conf using get_access_endpoint. Otherwise, any services
issuing requests to http://10.0.0.1:5000/v2.0 will receive the
default endpoints (localhost) instead of the correct ones.

Fixes rcbops/chef-cookbooks#639
Merge pull request #152 from DavidWittman/639-conf-endpoints

Set public and admin_endpoint in keystone.conf
added notification driver support
fixed typo
Un-hardcode api role in endpoint searches
Merge pull request #153 from claco/master

Merged automatically by jenkins after successful build test
Merge branch 'master' of github.com:rcbops-cookbooks/keystone into notification_driver
fixed typo

In adding this driver I made a typo /nova/keystone/
Merge pull request #154 from cloudnull/notification_driver

Merged automatically by jenkins after successful build test