From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 20 Oct 2015 21:38:03 +0000 (+0000)
Subject: Merge "Allow ctlplane network or ID, and default to "ctlplane""
X-Git-Tag: opnfv-6.0.0~2344
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=88efef101e3ce58d2c9e3f53070df936a497b518;p=apex-tripleo-heat-templates.git

Merge "Allow ctlplane network or ID, and default to "ctlplane""
---

88efef101e3ce58d2c9e3f53070df936a497b518