Merge "Rename NeutronServer to NeutronApi to align with ServiceNetMap"
This commit is contained in:
commit
aca397bcc7
|
@ -150,7 +150,10 @@ resource_registry:
|
||||||
OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
|
OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
|
||||||
OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
|
OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
|
||||||
OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.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
|
OS::TripleO::Services::NeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml
|
||||||
# can be the same as NeutronCorePlugin but some vendors install different
|
# can be the same as NeutronCorePlugin but some vendors install different
|
||||||
# things where VMs run
|
# things where VMs run
|
||||||
|
|
|
@ -128,7 +128,7 @@ parameters:
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
- OS::TripleO::Services::NeutronServer
|
- OS::TripleO::Services::NeutronApi
|
||||||
- OS::TripleO::Services::NeutronCorePlugin
|
- OS::TripleO::Services::NeutronCorePlugin
|
||||||
- OS::TripleO::Services::NeutronOvsAgent
|
- OS::TripleO::Services::NeutronOvsAgent
|
||||||
- OS::TripleO::Services::RabbitMQ
|
- OS::TripleO::Services::RabbitMQ
|
||||||
|
|
|
@ -47,7 +47,7 @@ outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Neutron Server agent service.
|
description: Role data for the Neutron Server agent service.
|
||||||
value:
|
value:
|
||||||
service_name: neutron_server
|
service_name: neutron_api
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
Loading…
Reference in New Issue