Merge "Add deployed server bootstrap to noop-ctlplane"
authorJenkins <jenkins@review.openstack.org>
Wed, 18 Jan 2017 21:41:03 +0000 (21:41 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 18 Jan 2017 21:41:03 +0000 (21:41 +0000)

Trivial merge