add ceilometer-api to ha-able services
Merge pull request #34 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
use -setup in keystone searches

Resolves TA246
Merge pull request #35 from rackerjoe/TA246

Merged automatically by jenkins after successful build test
Validate IP addresses before use.
Merge pull request #36 from git-harry/grizzly

Merged automatically by jenkins after successful build test
Set default osops_network for vips
Add default vip_network attribute per service
Change vrrp_interface to allow per service vip_network selection
Merge branch 'master' of https://github.com/odyssey4me/openstack-ha

Conflicts:
	attributes/default.rb
	recipes/default.rb