diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-19 06:52:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-19 06:52:31 +0000 |
| commit | a8366c93edfe92eaf6a7b9b5ac0f754f12c3a068 (patch) | |
| tree | a02c1d1c3393aacb88554f84d6c9993baefed1c8 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 3ca1a2d99d8c10f14a01213279480c21827ae345 (diff) | |
| parent | 633ab23f887ab68951cce4bee8cb71e77a28d461 (diff) | |
Merge "Add l2gw neutron agent support"
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 450e6116..7b8fe234 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -135,6 +135,7 @@ resource_registry: OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml OS::TripleO::Services::NeutronL2gwApi: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml + OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml # FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated # the multinode job ControllerServices after this patch merges |