diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-12 14:55:08 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-12 21:28:03 +0100 |
| commit | 2470cf899a61d7bad4f8cdb77be74bef1308a858 (patch) | |
| tree | 064bc16cf6eb2cf350ae456c4dba0c7fce8bd2ab | |
| parent | 65619843d29653fb952794a5c45076c8531266d4 (diff) | |
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
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 5 | ||||
| -rw-r--r-- | overcloud.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/neutron-api.yaml (renamed from puppet/services/neutron-server.yaml) | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 0ff634d4..3d7da47a 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -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 diff --git a/overcloud.yaml b/overcloud.yaml index c8fe671e..563fb2c4 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -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 diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-api.yaml index c40b37b0..c0c8122c 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-api.yaml @@ -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] |