Merge "N->O Upgrade, make sure all nova placement parameter properly set."
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Mar 2017 17:44:49 +0000 (17:44 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Mar 2017 17:44:49 +0000 (17:44 +0000)

Trivial merge