diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-03 01:48:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-03 01:48:27 +0000 |
| commit | 9df1c376846218a0869d32e5bf4e9270a0a8a4da (patch) | |
| tree | 5dc130fb9b2fbe6dfe1edbb91e53ab49981b4baf /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 5e871e70fec12325e62ef40733063c0c57432e03 (diff) | |
| parent | ee2c065be70f03a9f36f3183813d542642c63908 (diff) | |
Merge "Add support for linuxbridge agent"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c99fa3f1..d4c301bb 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -154,6 +154,7 @@ resource_registry: OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml OS::TripleO::Services::NeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml + OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml OS::TripleO::Services::Pacemaker: OS::Heat::None OS::TripleO::Services::PacemakerRemote: OS::Heat::None |