Merge pull request #31 from rackerjoe/master

revert 253ec347d9a59c3f5fe8ddafd2c128ff25097038, 6d834c41eb2ec043661561e51215e3c1885b9675, b4144ef114aaaefd552eb5c40975651c1b9b4fb3, d426901a5ad62cbcb17b381941da47005404d380, and c13a2d27d38e110e82e483e387e6b53d940b6249
Merge pull request #32 from rackerjoe/master

fix a typo
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
Add ability to adjust available_services settings and vrid
Fix to allow values to be set for ha services
Adjust commenting
Merge pull request #38 from andymcc/grizzly

Merged automatically by jenkins after successful build test
Allow vrrp_interface to be settable attribute
Merge pull request #39 from andymcc/grizzly

Merged automatically by jenkins after successful build test
Attribute format change
Merge pull request #40 from andymcc/grizzly

Merged automatically by jenkins after successful build test
remove keystone restarts from haproxy restarts
fix a foodcritic violation
Merge pull request #41 from rackerjoe/reloads

Merged automatically by jenkins after successful build test
Do not use the last octect of the IP address to determine the vrrp router id

Fixes DE171
Closes TA344