Add HA bits for OS metadata service
Merge pull request #376 from rackerjoe/v4.2.2rc

Merged automatically by jenkins after successful build test