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
Move Log.fatal to Application.fatal! method call

While cleaning up extraneous log information in chef-client output, I
noticed that we most likely meant Log.fatal to be a real
Application.fatal! since if was not wrapper in a nil check.
Merge pull request #149 from claco/fix-fatal-check

Merged automatically by jenkins after successful build test
Version Bump to 4.1.3
Merge pull request #150 from rackerjoe/master

Version Bump to 4.1.3
move version out of metadata.rb into VERSION
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