aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-31 15:26:19 +0000
committerGerrit Code Review <review@openstack.org>2017-07-31 15:26:19 +0000
commit48ead62f6fcb1b833c044f099644cb32a06c3206 (patch)
tree9d71df86de85ecebbf9678451eac0d7110d0a6b6 /manifests/profile/base
parent01ae50352519d80810739c0f9319f74aab2e786d (diff)
parent50f160a148b6a973891ffc6d0882f4c0d597336e (diff)
Merge "Prevent haproxy to run iptables during docker-puppet configuration"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/haproxy.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index 4f3322c..145f283 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -36,6 +36,11 @@
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
#
+# [*manage_firewall*]
+# (optional) Enable or disable firewall settings for ports exposed by HAProxy
+# (false means disabled, and true means enabled)
+# Defaults to hiera('tripleo::firewall::manage_firewall', true)
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@@ -44,12 +49,14 @@
class tripleo::profile::base::haproxy (
$certificates_specs = {},
$enable_load_balancer = hiera('enable_load_balancer', true),
+ $manage_firewall = hiera('tripleo::firewall::manage_firewall', true),
$step = Integer(hiera('step')),
) {
if $step >= 1 {
if $enable_load_balancer {
class {'::tripleo::haproxy':
internal_certificates_specs => $certificates_specs,
+ manage_firewall => $manage_firewall,
}
unless hiera('tripleo::haproxy::haproxy_service_manage', true) {