diff options
| -rw-r--r-- | build/build_perf_image.sh | 7 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 1 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-fdio-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-ovs-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-ovs-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-noha.yaml | 2 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 |
8 files changed, 9 insertions, 11 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index a6ca066b..68a1804f 100644 --- a/build/build_perf_image.sh +++ b/build/build_perf_image.sh @@ -32,5 +32,12 @@ fi if [ "$CATEGORY" == "kernel" ]; then echo "${KEY}=${VALUE}" >> $ROLE-kernel_params.txt + if [[ "$dataplane" == 'fdio' && "$KEY" == 'hugepages' ]]; then + # set kernel hugepages params for fdio + LIBGUESTFS_BACKEND=direct virt-customize --run-command "echo vm.hugetlb_shm_group=0 >> /usr/lib/sysctl.d/00-system.conf" \ + --run-command "echo vm.max_map_count=$(printf "%.0f" $(echo 2.2*$VALUE | bc)) >> /usr/lib/sysctl.d/00-system.conf" \ + --run-command "echo kernel.shmmax==$((VALUE * 2 * 1024 * 1024)) >> /usr/lib/sysctl.d/00-system.conf" \ + -a ${IMAGE} + fi fi diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 943716bc..0357ba05 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -130,6 +130,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ --run-command "yum install -y /root/fdio/*.rpm" \ + --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ --run-command "tar zxvf /root/fdio/vpp_papi*.tar.gz -C /" \ --install unzip \ --upload puppet-fdio.tar.gz:/etc/puppet/modules \ diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml index 81ff781d..4d27ae87 100644 --- a/config/deploy/os-nosdn-fdio-noha.yaml +++ b/config/deploy/os-nosdn-fdio-noha.yaml @@ -16,8 +16,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml index 89be0c3d..a72fef35 100644 --- a/config/deploy/os-nosdn-ovs-ha.yaml +++ b/config/deploy/os-nosdn-ovs-ha.yaml @@ -15,8 +15,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml index d13fd9ca..7d054cec 100644 --- a/config/deploy/os-nosdn-ovs-noha.yaml +++ b/config/deploy/os-nosdn-ovs-noha.yaml @@ -15,8 +15,6 @@ deploy_options: hugepagesz: 2M hugepages: 1024 Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml index 75d79ce7..f1297e82 100644 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -17,8 +17,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml index ad54fbdc..207c6f34 100644 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -19,8 +19,6 @@ deploy_options: intel_iommu: 'on' iommu: pt Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 30fd5e66..53c7eef2 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -140,7 +140,7 @@ EOI # Push performance options to subscript to modify per-role images as needed for option in "${performance_options[@]}" ; do echo -e "${blue}Setting performance option $option${reset}" - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "bash build_perf_image.sh $option" + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "dataplane=${deploy_options_array['dataplane']} bash build_perf_image.sh $option" done # Build IPA kernel option ramdisks |