From b0ec457332912476618c55752041f4440dd2cf68 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 25 May 2016 16:24:51 -0400 Subject: Update profiles for loadbalancer split Update loadbalancer (nonha and ha) and midonet profiles to consume new tripleo::haproxy class. Keep it backward compatible with old interface until we update THT by using stdlib function: pick. So we first try to get new parameters otherwise we fallback to the old interface. Change-Id: I46ed8348dc990d9aa0d896e1abea3b30a8292634 --- manifests/profile/base/neutron/midonet.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/profile/base/neutron/midonet.pp') diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 7374c57..60aa006 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -20,7 +20,7 @@ # # [*vip*] # (Optional) Public Virtual IP Address for this cloud -# Defaults to hiera('tripleo::loadbalancer::public_virtual_ip') +# Defaults to hiera('public_virtual_ip') # # [*keystone_admin_token*] # (Optional) The Keystone Admin Token @@ -68,7 +68,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::midonet ( - $vip = hiera('tripleo::loadbalancer::public_virtual_ip', ''), + $vip = hiera('public_virtual_ip', 'tripleo::loadbalancer::public_virtual_ip'), $keystone_admin_token = hiera('keystone::admin_token', ''), $zookeeper_client_ip = hiera('neutron::bind_host', ''), $zookeeper_hostnames = hiera('controller_node_names', ''), -- cgit 1.2.3-korg