openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Use correct manage_firewall hieradata"

Browse Source
This commit is contained in:
Jenkins 2017-04-04 22:02:55 +00:00 committed by Gerrit Code Review
commit 4ce1828118
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/haproxy.pp
View File

@ -1377,7 +1377,7 @@ class tripleo::haproxy (
server_names => hiera('mysql_node_names', $controller_hosts_names_real), server_names => hiera('mysql_node_names', $controller_hosts_names_real),
options => $mysql_member_options_real, options => $mysql_member_options_real,
} }
if hiera('manage_firewall', true) { if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall include ::tripleo::firewall
$mysql_firewall_rules = { $mysql_firewall_rules = {
'100 mysql_haproxy' => { '100 mysql_haproxy' => {
@ -1462,7 +1462,7 @@ class tripleo::haproxy (
server_names => hiera('redis_node_names', $controller_hosts_names_real), server_names => hiera('redis_node_names', $controller_hosts_names_real),
options => $haproxy_member_options, options => $haproxy_member_options,
} }
if hiera('manage_firewall', true) { if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall include ::tripleo::firewall
$redis_firewall_rules = { $redis_firewall_rules = {
'100 redis_haproxy' => { '100 redis_haproxy' => {

2
manifests/haproxy/endpoint.pp
View File

@ -147,7 +147,7 @@ define tripleo::haproxy::endpoint (
server_names => $server_names, server_names => $server_names,
options => $member_options, options => $member_options,
} }
if hiera('manage_firewall', true) { if hiera('tripleo::firewall::manage_firewall', true) {
include ::tripleo::firewall include ::tripleo::firewall
# This block will construct firewall rules only when we specify # This block will construct firewall rules only when we specify
# a port for the regular service and also the ssl port for the service. # a port for the regular service and also the ssl port for the service.