From 08e52d4ee0e5ecb6caf033a9ecfbb762c98d400e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 13 Jul 2017 16:35:25 +0400 Subject: Tune network sysctl options * tune net/tcp opts * handle vcpus setting for vms * fix tempest issue with public subnets visible * set reclass data source to local to avoid git clone Change-Id: Ibac9eba8234ebb20854c03b399405968cb2069e8 Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 5 +++-- .../classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml | 5 +++++ .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 5 +++-- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 6 ++++++ mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 5 +++-- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml | 6 ++++++ 6 files changed, 26 insertions(+), 6 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml index 4fbc7871c..328d6df46 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml @@ -15,8 +15,7 @@ classes: parameters: _param: openstack_control_node01_hostname: ctl01 - reclass_data_repository: https://gerrit.opnfv.org/gerrit/fuel - reclass_data_revision: master + reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master reclass_config_master: 192.168.10.100 @@ -36,6 +35,8 @@ parameters: netmask: 255.255.255.0 reclass: storage: + data_source: + engine: local node: openstack_control_node01: name: ${_param:openstack_control_node01_hostname} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml index cddecd375..66e5a9788 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml @@ -95,6 +95,11 @@ parameters: architectures: amd64 key_id: EC4926EA key_server: keyserver.ubuntu.com + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 network: host: ctl: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index 59320853a..864c71daa 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml @@ -14,8 +14,7 @@ classes: parameters: _param: openstack_control_node01_hostname: ctl01 - reclass_data_repository: https://gerrit.opnfv.org/gerrit/fuel - reclass_data_revision: master + reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master reclass_config_master: 192.168.10.100 @@ -35,6 +34,8 @@ parameters: netmask: 255.255.255.0 reclass: storage: + data_source: + engine: local node: openstack_control_node01: name: ${_param:openstack_control_node01_hostname} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml index f7980f78a..dfc0b5106 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml @@ -95,6 +95,12 @@ parameters: keystone_aodh_password: opnfv_secret aodh_service_host: 172.16.10.108 linux: + system: + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 network: host: ctl: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml index 66ad53b48..97730b1fd 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml @@ -14,8 +14,7 @@ classes: parameters: _param: openstack_control_node01_hostname: ctl01 - reclass_data_repository: https://gerrit.opnfv.org/gerrit/fuel - reclass_data_revision: master + reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master reclass_config_master: 192.168.10.100 @@ -35,6 +34,8 @@ parameters: netmask: 255.255.255.0 reclass: storage: + data_source: + engine: local node: openstack_control_node01: name: ${_param:openstack_control_node01_hostname} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml index 866724d30..7079fd100 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml @@ -88,6 +88,12 @@ parameters: keystone_aodh_password: opnfv_secret aodh_service_host: 172.16.10.108 linux: + system: + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 network: host: ctl: -- cgit 1.2.3-korg