Merge "Make install of kolla optional on the undercloud"
authorJenkins <jenkins@review.openstack.org>
Thu, 13 Apr 2017 22:15:15 +0000 (22:15 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 13 Apr 2017 22:15:16 +0000 (22:15 +0000)

Trivial merge