Merge "Adds configuring vpp/hc on all nodes"

diff --combined build/network-environment.yaml
index 4493322,bbd0796..8b5b070
--- 1/build/network-environment.yaml
--- 2/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@@ -39,7 -39,6 +39,6 @@@ resource_registry
    OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml
    OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml
  
- 
  parameter_defaults:
    NeutronExternalNetworkBridge: 'br-ex'
    ControlPlaneSubnetCidr: "24"
@@@ -82,7 -81,6 +81,7 @@@ parameters
      SwiftMgmtNetwork: storage
      SwiftProxyNetwork: storage
      TackerApiNetwork: internal_api
 +    CongressApiNetwork: internal_api
      HorizonNetwork: internal_api
      MemcachedNetwork: internal_api
      RabbitMqNetwork: internal_api

diff --combined config/deploy/os-odl_l2-fdio-ha.yaml
index b6b073f,c7a9d8e..c66b35b
--- 1/config/deploy/os-odl_l2-fdio-ha.yaml
--- 2/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@@ -6,7 -6,21 +6,21 @@@ deploy_options
    sdn_l3: false
    odl_version: boron
    tacker: true
 -  congress: false
 +  congress: true
    sfc: false
    vpn: false
    vpp: true
+   dataplane: fdio
+   performance:
+     Controller:
+       kernel:
+         hugepages: 1024
+         hugepagesz: 2M
+     Compute:
+       nova:
+         libvirtpin: 1
+       kernel:
+         hugepagesz: 2M
+         hugepages: 4096
+         intel_iommu: 'on'
+         iommu: pt

diff --combined config/deploy/os-odl_l2-fdio-noha.yaml
index f323e2c,ca09015..15942fd
--- 1/config/deploy/os-odl_l2-fdio-noha.yaml
--- 2/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@@ -6,7 -6,23 +6,23 @@@ deploy_options
    sdn_l3: false
    odl_version: boron
    tacker: true
 -  congress: false
 +  congress: true
    sfc: false
    vpn: false
    vpp: true
+   dataplane: fdio
+   performance:
+     Controller:
+       kernel:
+         hugepages: 1024
+         hugepagesz: 2M
+         intel_iommu: 'on'
+         iommu: pt
+     Compute:
+       nova:
+         libvirtpin: 1
+       kernel:
+         hugepagesz: 2M
+         hugepages: 4096
+         intel_iommu: 'on'
+         iommu: pt

diff --combined lib/overcloud-deploy-functions.sh
index 1fcaa0d,5b0e1ac..e613dae
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -71,7 -71,7 +71,7 @@@ function overcloud_deploy 
    scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2
  
    # Install ovs-dpdk inside the overcloud image if it is enabled.
-   if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then
+   if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
      # install dpdk packages before ovs
      echo -e "${blue}INFO: Enabling kernel modules for dpdk inside overcloud image${reset}"
  
@@@ -90,9 -90,16 +90,16 @@@ EO
                                                 --upload uio_pci_generic.modules:/etc/sysconfig/modules/ \
                                                 --run-command "chmod 0755 /etc/sysconfig/modules/vfio_pci.modules" \
                                                 --run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \
-                                                --run-command "yum install -y /root/dpdk_rpms/*" \
                                                 -a overcloud-full.qcow2
+ 
+       if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
+         sed -i '/FdioEnabled:/c\  FdioEnabled: true' opnfv-environment.yaml
+       else
+         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \
+                                                  -a overcloud-full.qcow2
+       fi
  EOI
+ 
    elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
      echo "${red}${deploy_options_array['dataplane']} not supported${reset}"
      exit 1
@@@ -148,6 -155,12 +155,12 @@@ find . | cpio -o -H newc | gzip > /home
  chown stack /home/stack/Controller-ironic-python-agent.initramfs
  popd
  /bin/rm -rf ipa/
+ EOI
+ 
+     # set NIC heat params and resource registry
+     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ sed -i '/TenantNIC:/c\  TenantNIC: '${private_network_compute_interface} opnfv-environment.yaml
+ sed -i '/PublicNIC:/c\  PublicNIC: '${public_network_compute_interface} opnfv-environment.yaml
  EOI
  
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml"
@@@ -199,18 -212,10 +212,18 @@@ if [ "$debug" == 'TRUE' ]; the
      LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
  fi
  
 -if [ "${deploy_options_array['tacker']}" == 'True' ]; then
 -    sed -i '/EnableTacker/\\c  EnableTacker: true' opnfv-environment.yaml
 +if [ "${deploy_options_array['tacker']}" == 'False' ]; then
 +    sed -i '/EnableTacker:/c\  EnableTacker: false' opnfv-environment.yaml
  fi
  
 +# Create a key for use by nova for live migration
 +echo "Creating nova SSH key for nova resize support"
 +ssh-keygen -f nova_id_rsa -b 1024 -P ""
 +public_key=\'\$(cat nova_id_rsa.pub | cut -d ' ' -f 2)\'
 +sed -i "s#replace_public_key:#key: \$public_key#g" opnfv-environment.yaml
 +python -c 'open("opnfv-environment-new.yaml", "w").write((open("opnfv-environment.yaml").read().replace("replace_private_key:", "key: \"" + "".join(open("nova_id_rsa").readlines()).replace("\\n","\\\n") + "\"")))'
 +mv -f opnfv-environment-new.yaml opnfv-environment.yaml
 +
  source stackrc
  set -o errexit
  # Workaround for APEX-207 where sometimes swift proxy is down