Remove monit conf file when using https
Merge pull request #60 from andymcc/nomonit_ssl

Merged automatically by jenkins after successful build test
Use different IP for KS service and admin APIs
Merge pull request #61 from hughsaunders/keystone_vips

Merged automatically by jenkins after successful build test
Don't try restart apache if it isn't included as a recipe
add the ability to separately specify internal/admin/public endpoint types
Merge branch 'grizzly' into TA402

Conflicts:
	attributes/default.rb
use get_bind_endpoint so no HA assumptions are made
use get_bind_endpoint correctly
Merge pull request #62 from andymcc/service_restart_chk

Merged automatically by jenkins after successful build test
For SSL restart monit to prevent cinder restarting
Merge pull request #63 from andymcc/monit_restart

Merged automatically by jenkins after successful build test
Merge pull request #59 from mancdaz/TA402

Merged automatically by jenkins after successful build test