summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2017-04-03 14:04:47 +0000
committerBen Nemec <bnemec@redhat.com>2017-04-03 14:04:47 +0000
commitbc6bfc593ecd4e565a6721d92ea3fe45fd81b7df (patch)
treed452333cc7013ff3ff493ef68a87945f4f233ee7
parent2e7fbe1d95cf0d57724f4acc4bd51d35ed756b4a (diff)
Use correct manage_firewall hieradata
The manage_firewall hieradata was moved to tripleo::firewall::manage_firewall but some of the references to it were not updated, which makes it impossible to completely disable the firewall rules. Change-Id: I5f40f3b8b07bd312cce862aa319b8a1ef331ee49 Closes-Bug: 1679189
-rw-r--r--manifests/haproxy.pp4
-rw-r--r--manifests/haproxy/endpoint.pp2
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 92edd71..5712f9f 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1377,7 +1377,7 @@ class tripleo::haproxy (
server_names => hiera('mysql_node_names', $controller_hosts_names_real),
options => $mysql_member_options_real,
}
- if hiera('manage_firewall', true) {
+ if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall
$mysql_firewall_rules = {
'100 mysql_haproxy' => {
@@ -1462,7 +1462,7 @@ class tripleo::haproxy (
server_names => hiera('redis_node_names', $controller_hosts_names_real),
options => $haproxy_member_options,
}
- if hiera('manage_firewall', true) {
+ if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall
$redis_firewall_rules = {
'100 redis_haproxy' => {
diff --git a/manifests/haproxy/endpoint.pp b/manifests/haproxy/endpoint.pp
index da2aba3..16e0bd1 100644
--- a/manifests/haproxy/endpoint.pp
+++ b/manifests/haproxy/endpoint.pp
@@ -147,7 +147,7 @@ define tripleo::haproxy::endpoint (
server_names => $server_names,
options => $member_options,
}
- if hiera('manage_firewall', true) {
+ if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall
# This block will construct firewall rules only when we specify
# a port for the regular service and also the ssl port for the service.