Merge "Use correct manage_firewall hieradata" into stable/ocata

This commit is contained in:
Jenkins 2017-07-25 05:56:00 +00:00 committed by Gerrit Code Review
commit 54d8983a2b
2 changed files with 3 additions and 3 deletions

View File

@ -1374,7 +1374,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' => {
@ -1459,7 +1459,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' => {

View File

@ -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.