Merge "Fix standalone ControllerOpenstack vars" into stable/pike
authorZuul <zuul@review.openstack.org>
Thu, 2 Nov 2017 11:00:14 +0000 (11:00 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Nov 2017 11:00:14 +0000 (11:00 +0000)

Trivial merge