Rename NeutronServer to NeutronApi to align with ServiceNetMap
The new composable service name conflicts with the existing ServiceNetMap naming, so align with NeutronApi since ServiceNetMap exists in current released versions. This is required so we can correctly generate the neutron_api_node_ips list (needed by puppet-tripleo) based on the service_name. Change-Id: Ic1d45cbaa77bc6ac9ca247c880a9845ca49905da Partially-Implements: blueprint custom-roles
This commit is contained in:
parent
65619843d2
commit
2470cf899a
@ -151,7 +151,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
|
||||
|
@ -127,7 +127,7 @@ parameters:
|
||||
- OS::TripleO::Services::NeutronDhcpAgent
|
||||
- OS::TripleO::Services::NeutronL3Agent
|
||||
- OS::TripleO::Services::NeutronMetadataAgent
|
||||
- OS::TripleO::Services::NeutronServer
|
||||
- OS::TripleO::Services::NeutronApi
|
||||
- OS::TripleO::Services::NeutronCorePlugin
|
||||
- OS::TripleO::Services::NeutronOvsAgent
|
||||
- OS::TripleO::Services::RabbitMQ
|
||||
|
@ -47,7 +47,7 @@ outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron Server agent service.
|
||||
value:
|
||||
service_name: neutron_server
|
||||
service_name: neutron_api
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronBase, role_data, config_settings]
|
Loading…
x
Reference in New Issue
Block a user