diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-18 04:24:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-18 04:24:26 +0000 |
| commit | aca397bcc74bd3e8e7926d4c9e18730e8dfd745a (patch) | |
| tree | 816ab1746028cd9fa453515696dbac195f1e9cf3 /overcloud-resource-registry-puppet.yaml | |
| parent | bacc2c6f6cb0b80bd39c4164e8487e583b6976ba (diff) | |
| parent | 2470cf899a61d7bad4f8cdb77be74bef1308a858 (diff) | |
Merge "Rename NeutronServer to NeutronApi to align with ServiceNetMap"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 14db6494..1084267f 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -150,7 +150,10 @@ resource_registry: OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml - OS::TripleO::Services::NeutronServer: puppet/services/neutron-server.yaml + # FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated + # the multinode job ControllerServices after this patch merges + OS::TripleO::Services::NeutronServer: puppet/services/neutron-api.yaml + OS::TripleO::Services::NeutronApi: puppet/services/neutron-api.yaml OS::TripleO::Services::NeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml # can be the same as NeutronCorePlugin but some vendors install different # things where VMs run |