diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-06 10:54:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-06 10:54:32 +0000 |
| commit | 25caba5ce844c722e590333be87a0a7346f02a35 (patch) | |
| tree | 45f512f335d67e87e4ffc657b00cfbad43bfd9e6 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | c24cec0fa70370d548c055c5977e8a2da1f2531b (diff) | |
| parent | 6a151ec6974a658b8ff4c3116b405da99e242ced (diff) | |
Merge "Enable Neutron LBaaS Integration"
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 51cc85d8..a579ee94 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -138,6 +138,7 @@ resource_registry: 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::NeutronLbaasv2Agent: 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 |