Merge "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"
authorJenkins <jenkins@review.openstack.org>
Fri, 30 Jun 2017 08:35:46 +0000 (08:35 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 30 Jun 2017 08:35:46 +0000 (08:35 +0000)

Trivial merge