aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-31 12:26:15 +0000
committerGerrit Code Review <review@openstack.org>2016-05-31 12:26:15 +0000
commitf9a557f90dcb101e5709cbb09e7205dd594f9580 (patch)
treeb38e66cf13c562492122c85cdc9fe17590ba8c6e /manifests/profile/base
parent325dc2a17715c927327f2f4de13d8c10ab70fd72 (diff)
parentb0ec457332912476618c55752041f4440dd2cf68 (diff)
Merge "Update profiles for loadbalancer split"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/loadbalancer.pp15
-rw-r--r--manifests/profile/base/neutron/midonet.pp4
2 files changed, 14 insertions, 5 deletions
diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp
index 2a961c4..e5a0f48 100644
--- a/manifests/profile/base/loadbalancer.pp
+++ b/manifests/profile/base/loadbalancer.pp
@@ -44,9 +44,18 @@ class tripleo::profile::base::loadbalancer (
if $step >= 1 {
if $enable_load_balancer {
- class { '::tripleo::loadbalancer':
- controller_hosts => $controller_node_ips,
- controller_hosts_names => $controller_node_names,
+ # TODO(emilien): remove this conditional once
+ # https://review.openstack.org/#/c/320411/ is merged.
+ if hiera('tripleo::loadbalancer::keystone_admin', undef) {
+ class { '::tripleo::loadbalancer':
+ controller_hosts => $controller_node_ips,
+ controller_hosts_names => $controller_node_names,
+ }
+ } else {
+ class { '::tripleo::haproxy':
+ controller_hosts => $controller_node_ips,
+ controller_hosts_names => $controller_node_names,
+ }
}
}
}
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', ''),