Enables auto-detection for VIP interfaces
authorTim Rozet <trozet@redhat.com>
Mon, 24 Oct 2016 20:36:10 +0000 (16:36 -0400)
committerTim Rozet <trozet@redhat.com>
Mon, 24 Oct 2016 20:41:32 +0000 (16:41 -0400)
commitf49d4d23f6a294b535451180a1c006f50ee582c2
tree55afeac9984b4aef8f0ff50b90c423cf0c2d5b96
parent38664900523ae0cdd346d4c66395b8fd0184b03a
Enables auto-detection for VIP interfaces

Previously the ctrl plane VIP would default to 'br-ex' which in non-vlan
deployments ends up being the wrong interface.  The public VIP interface
was also defaulted to 'br-ex' which would be incorrect for vlan based
deployments.  Since a user has already given the nic template (and in
most cases the subnet that corresponds to the nic) the installer should
be able to figure out which interface the public/control vip should be
on.

These changes enable that type of auto-detection, unless a user
explicitly overrides the heat parameters for ControlVirtualInterface and
PublicVirtualInterface.  Also, incorrect parameters from haproxy service
are removed.

Depends-On: I05105fce85be8ace986db351cdca2916f405ed04

Closes-Bug: 1606632

Change-Id: I3c1c39824ec32ced304a782edc6ef49c0769c108
Signed-off-by: Tim Rozet <trozet@redhat.com>
puppet/services/haproxy.yaml
puppet/services/keepalived.yaml