diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-04 22:02:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-04 22:02:55 +0000 |
| commit | 4ce18281189d168053453ae946505a3623f0dfd6 (patch) | |
| tree | cf280e2b859c5301f3981554134dc27196893e3b | |
| parent | 1645db04ff772fc91189591c5ce09bd37243017d (diff) | |
| parent | bc6bfc593ecd4e565a6721d92ea3fe45fd81b7df (diff) | |
Merge "Use correct manage_firewall hieradata"
| -rw-r--r-- | manifests/haproxy.pp | 4 | ||||
| -rw-r--r-- | manifests/haproxy/endpoint.pp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index ca83407..e5d57e5 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. |