Merge "moving inventory file parsing to python"

diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh
index a6ca066..68a1804 100644 (file)
--- 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 943716b..0357ba0 100755 (executable)
--- 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/build/undercloud.sh b/build/undercloud.sh
index 10c46e7..a4d008e 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -51,7 +51,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "sed -i '/SERVICE_LIST/a\\    \x27tacker\x27: {\x27password_field\x27: \x27OVERCLOUD_TACKER_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \
     --run-command "sed -i '/PASSWORD_NAMES =/a\\    \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \
     --run-command "sed -i '/AodhPassword/a\\        parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \
-    --run-command "sed -i '/^SERVICES/a\    \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
+    --run-command "sed -i '/^SERVICES/a\    \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
     --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
     --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
     --install "python2-aodhclient" \

diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml
index 81ff781..4d27ae8 100644 (file)
--- 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 89be0c3..a72fef3 100644 (file)
--- 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 d13fd9c..7d054ce 100644 (file)
--- 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 75d79ce..f1297e8 100644 (file)
--- 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 ad54fbd..207c6f3 100644 (file)
--- 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 30fd5e6..53c7eef 100755 (executable)
--- 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