Merge "Fixes FDIO kernel settings"

diff --combined build/overcloud-full.sh
index 943716b,7843f21..0357ba0
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -130,6 -130,7 +130,7 @@@ LIBGUESTFS_BACKEND=direct virt-customiz
      --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 \
@@@ -144,10 -145,7 +145,10 @@@
      --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
      --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
      --run-command "pip install python-senlinclient" \
 -    --upload ../interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \
 +    --upload ../neutron/agent/interface/interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \
 +    --run-command "mkdir /root/fdio_neutron_l3" \
 +    --upload ../neutron/agent/l3/namespaces.py:/root/fdio_neutron_l3/ \
 +    --upload ../neutron/agent/l3/router_info.py:/root/fdio_neutron_l3/ \
      -a overcloud-full_build.qcow2
  
  mv -f overcloud-full_build.qcow2 overcloud-full.qcow2

diff --combined lib/overcloud-deploy-functions.sh
index 30fd5e6,4d6bdad..53c7eef
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -97,9 -97,6 +97,9 @@@ EO
  
        if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
          sudo sed -i '/FdioEnabled:/c\  FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
 +        LIBGUESTFS_BACKEND=direct virt-customize --run-command "cp -f /root/fdio_neutron_l3/namespaces.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
 +                                                 --run-command "cp -f /root/fdio_neutron_l3/router_info.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
 +                                                 -a overcloud-full.qcow2
          if [ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]; then
            LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /root/ && tar zxvf networking-odl.tar.gz" \
                                                     --run-command "cd /root/networking-odl && git init && pip install -r requirements.txt" \
@@@ -140,7 -137,7 +140,7 @@@ EO
      # 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