Merge "Add update yaml backward compatibe with PublicVirtualIP on ctlplane"
authorJenkins <jenkins@review.openstack.org>
Thu, 21 Jan 2016 19:41:04 +0000 (19:41 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 21 Jan 2016 19:41:04 +0000 (19:41 +0000)

Trivial merge