From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 26 Aug 2016 11:32:28 +0000 (+0000)
Subject: Merge "SR-IOV nic agent changes in line with composable roles."
X-Git-Tag: opnfv-6.0.0~1708
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8b13b8c811f3f05604050a07ef4202860436262a;p=apex-tripleo-heat-templates.git

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

8b13b8c811f3f05604050a07ef4202860436262a
diff --cc overcloud-resource-registry-puppet.yaml
index 5c8b77cc,2c421fa1..ab4d249f
--- a/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