Merge "Add environment for deployed-server with pacemaker" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 6 Apr 2017 18:22:40 +0000 (18:22 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 6 Apr 2017 18:22:40 +0000 (18:22 +0000)

Trivial merge