openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Increase size of connection tracking table"

Browse Source
This commit is contained in:
Jenkins 2016-02-18 00:45:17 +00:00 committed by Gerrit Code Review
commit 5e87149665
7 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/hieradata/common.yaml
View File

@ -14,6 +14,9 @@ nova::network::neutron::dhcp_domain: ''
neutron::allow_overlapping_ips: true
kernel_modules:
nf_conntrack: {}
sysctl_settings:
net.ipv4.tcp_keepalive_intvl:
value: 1
@ -21,6 +24,10 @@ sysctl_settings:
value: 5
net.ipv4.tcp_keepalive_time:
value: 5
net.nf_conntrack_max:
value: 500000
net.netfilter.nf_conntrack_max:
value: 500000
nova::rabbit_heartbeat_timeout_threshold: 60
neutron::rabbit_heartbeat_timeout_threshold: 60

2
puppet/manifests/overcloud_cephstorage.pp
View File

@ -16,7 +16,9 @@
include ::tripleo::packages
include ::tripleo::firewall
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp

2
puppet/manifests/overcloud_compute.pp
View File

@ -16,7 +16,9 @@
include ::tripleo::packages
include ::tripleo::firewall
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp

2
puppet/manifests/overcloud_controller.pp
View File

@ -20,7 +20,9 @@ $enable_load_balancer = hiera('enable_load_balancer', true)
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
$controller_node_ips = split(hiera('controller_node_ips'), ',')

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -39,7 +39,9 @@ $non_pcmk_start = hiera('step') >= 4
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
include ::timezone

2
puppet/manifests/overcloud_object.pp
View File

@ -16,7 +16,9 @@
include ::tripleo::packages
include ::tripleo::firewall
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp

2
puppet/manifests/overcloud_volume.pp
View File

@ -16,7 +16,9 @@
include ::tripleo::packages
include ::tripleo::firewall
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp