Merge "Fix cinder-{backup,volume} container with pacemaker" into stable/pike
authorZuul <zuul@review.openstack.org>
Fri, 10 Nov 2017 13:25:06 +0000 (13:25 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 10 Nov 2017 13:25:06 +0000 (13:25 +0000)

Trivial merge