From: Dan Sneddon Date: Sat, 27 Jun 2015 20:10:54 +0000 (-0700) Subject: Add ControlPlaneNetwork to vip.yaml X-Git-Tag: opnfv-6.0.0~2453^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0f1f1d6b48c901f7419ef66fa11bdc704ee9f68d;p=apex-tripleo-heat-templates.git 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 --- 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: