Merge "SR-IOV nic agent changes in line with composable roles."

diff --cc overcloud-resource-registry-puppet.yaml
index 5c8b77c,2c421fa..ab4d249
--- 1/overcloud-resource-registry-puppet.yaml
--- 2/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@@ -165,9 -165,9 +165,10 @@@ resource_registry
    OS::TripleO::Services::NeutronCorePluginOpencontrail: puppet/services/neutron-plugin-opencontrail.yaml
    OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
    OS::TripleO::Services::NeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
 +  # ComputeNeutronOvsAgent can be overriden to puppet/services/neutron-ovs-dpdk-agent.yaml also to enable DPDK
    OS::TripleO::Services::ComputeNeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
    OS::TripleO::Services::Pacemaker: OS::Heat::None
+   OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
    OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
    OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
    OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml

diff --cc overcloud.yaml
Simple merge