summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-06-27 13:10:54 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-06-27 13:10:54 -0700
commit0f1f1d6b48c901f7419ef66fa11bdc704ee9f68d (patch)
tree4517d60041fb727dd619f66029163a4592398e4f
parent1e804d5b2e5324de84772cf45639cdc78d398d35 (diff)
Add ControlPlaneNetwork to vip.yaml
There are two files in network/ports which control the VIP behavior called ctlplane_vip.yaml and vip.yaml. One of these files was missing ControlPlaneNetwork, since it wasn't used inside the template. Unfortunately, tuskar chokes on this, even though Heat can build the stack just fine. This change makes the vip.yaml and ctlplane_vip.yaml equivalent by adding ControlPlaneNetwork to the vip.yaml template. Change-Id: Ic20281e58a1130afe18d5aec505a3df199841fd5
-rw-r--r--network/ports/vip.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/network/ports/vip.yaml b/network/ports/vip.yaml
index b957e132..ab72083d 100644
--- a/network/ports/vip.yaml
+++ b/network/ports/vip.yaml
@@ -15,6 +15,10 @@ parameters:
ControlPlaneIP: # Here for compatability with noop.yaml
description: IP address on the control plane
type: string
+ ControlPlaneNetwork:
+ description: The name of the undercloud Neutron control plane
+ default: ctlplane
+ type: string
resources: