Merge "Remove controller specific bootstack_nodeid"
authorJenkins <jenkins@review.openstack.org>
Wed, 12 Jul 2017 19:39:13 +0000 (19:39 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 12 Jul 2017 19:39:13 +0000 (19:39 +0000)

Trivial merge