Merge pull request #1 from mancdaz/master

Merged automatically by jenkins after successful build test
Adding haproxy into openstack-ha (part 2)
Merge pull request #2 from galstrom21/master

Merged automatically by jenkins after successful build test
add glance-registry to ha-able services

- add to service array in attributes
- do not update glance endpoint if glance-registry