Merge "Add networking-vpp ML2 support"

diff --cc build/overcloud-full.sh
Simple merge

diff --cc build/rpm_specs/opnfv-apex-common.spec
Simple merge

diff --cc lib/overcloud-deploy-functions.sh
index 72364ae,3ffe3b1..36346d8
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -193,12 -206,11 +206,12 @@@ EO
  EOI
    fi
  
-   # Override any previous packages if FDIO and L2
-   if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
+   # Override any previous packages if FDIO and ODL L2
+   if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 -         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \
 +         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \
                                                    --run-command "yum -y install /root/fdio_l2/*.rpm" \
 +                                                  --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
                                                    -a overcloud-full.qcow2
  EOI
    fi