aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-26 10:37:34 +0000
committerGerrit Code Review <review@openstack.org>2015-11-26 10:37:35 +0000
commitfdc2359e4515dfa50048b3b6cd4896ef4744cc5f (patch)
tree2f0057684098c2593a8d29954c165453763d9bc5 /puppet/controller.yaml
parenta8bf039544ebf9b9e41a871445b6661182ad7044 (diff)
parent2a6da17a3a62d2e05907e32eb78d37d22714ea7a (diff)
Merge "Make load balancer deployment optional via template param"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 9792e7dc..861b29a8 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -106,6 +106,10 @@ parameters:
default: true
description: Whether to use Galera instead of regular MariaDB.
type: boolean
+ EnableLoadBalancer:
+ default: true
+ description: Whether to deploy a LoadBalancer on the Controller
+ type: boolean
EnableCephStorage:
default: false
description: Whether to deploy Ceph Storage (OSD) on the Controller
@@ -835,6 +839,7 @@ resources:
keystone_ec2_uri: { get_param: [EndpointMap, KeystoneEC2, uri] }
enable_fencing: {get_param: EnableFencing}
enable_galera: {get_param: EnableGalera}
+ enable_load_balancer: {get_param: EnableLoadBalancer}
enable_ceph_storage: {get_param: EnableCephStorage}
enable_swift_storage: {get_param: EnableSwiftStorage}
manage_firewall: {get_param: ManageFirewall}
@@ -1054,6 +1059,7 @@ resources:
# Pacemaker
enable_fencing: {get_input: enable_fencing}
+ enable_load_balancer: {get_input: enable_load_balancer}
hacluster_pwd: {get_input: pcsd_password}
tripleo::fencing::config: {get_input: fencing_config}