summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-05-31 08:54:36 -0400
committerEmilien Macchi <emilien@redhat.com>2016-06-02 22:23:07 -0400
commitca2efb57616ec88b6028e2921c4f18e8a0b4ec14 (patch)
treec0bf4fffc62b9551ac0821299a549b1077fcc48a /manifests/profile/base/neutron
parent4529b60bdebb6168c08b1d46873287dc7770981a (diff)
Remove tripleo::loadbalancer
The split has been done on both undercloud & overcloud, they now use tripleo::haproxy and tripleo::keepalived. We can move forward with removing tripleo::loadbalancer and tripleo::loadbalancer::endpoint, not used anymore. Simplify tripleo::profile::base::loadbalancer to just include tripleo::haproxy and rely on Hiera for parameters. Change-Id: Ieeb1e94117ae9cb8b11320306de3a9b236bd989a
Diffstat (limited to 'manifests/profile/base/neutron')
-rw-r--r--manifests/profile/base/neutron/midonet.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index 60aa006..972856f 100644
--- a/manifests/profile/base/neutron/midonet.pp
+++ b/manifests/profile/base/neutron/midonet.pp
@@ -68,7 +68,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::midonet (
- $vip = hiera('public_virtual_ip', 'tripleo::loadbalancer::public_virtual_ip'),
+ $vip = hiera('public_virtual_ip'),
$keystone_admin_token = hiera('keystone::admin_token', ''),
$zookeeper_client_ip = hiera('neutron::bind_host', ''),
$zookeeper_hostnames = hiera('controller_node_names', ''),