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 <mpolenchuk@mirantis.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index f98246d..a1f5e38 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -244,10 +244,12 @@ source lib.sh
 eval $(parse_yaml ../config/defaults.yaml)
 eval $(parse_yaml ../config/${DEPLOY_SCENARIO}.yaml)
 
-declare -A virtual_nodes_ram
+declare -A virtual_nodes_ram virtual_nodes_vcpus
 for node in "${virtual_nodes[@]}"; do
     virtual_custom_ram="virtual_${node}_ram"
+    virtual_custom_vcpus="virtual_${node}_vcpus"
     virtual_nodes_ram[$node]=${!virtual_custom_ram:-$virtual_default_ram}
+    virtual_nodes_vcpus[$node]=${!virtual_custom_vcpus:-$virtual_default_vcpus}
 done
 
 export CLUSTER_DOMAIN=$cluster_domain
@@ -259,7 +261,7 @@ export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i
 generate_ssh_key
 prepare_vms virtual_nodes $base_image
 create_networks
-create_vms virtual_nodes virtual_nodes_ram
+create_vms virtual_nodes virtual_nodes_ram virtual_nodes_vcpus
 update_pxe_network
 start_vms virtual_nodes
 check_connection

diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index acb039e..205e0a9 100755 (executable)
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -1,3 +1,3 @@
 salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list"
-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --share --external --provider-network-type flat --provider-physical-network physnet1 floating_net"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --external --default --provider-network-type flat --provider-physical-network physnet1 floating_net"
 salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"

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 4fbc787..328d6df 100644 (file)
--- 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 cddecd3..66e5a97 100644 (file)
--- 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 5932085..864c71d 100644 (file)
--- 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 f7980f7..dfc0b51 100644 (file)
--- 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 66ad53b..97730b1 100644 (file)
--- 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 866724d..7079fd1 100644 (file)
--- 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:

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index b3abd21..fb3fc99 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -54,10 +54,11 @@ create_networks() {
 create_vms() {
   local -n vnodes=$1
   local -n vnodes_ram=$2
+  local -n vnodes_vcpus=$3
 
   # create vms with specified options
   for node in "${vnodes[@]}"; do
-    virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus=2 --cpu host --accelerate \
+    virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus ${vnodes_vcpus[$node]} --cpu host --accelerate \
     --network network:pxe,model=virtio \
     --network network:mgmt,model=virtio \
     --network network:internal,model=virtio \