openstack/tripleo-heat-templates
Code Issues Proposed changes

Resolve FIXME for NeutronServer mapping

Browse Source 
The NeutronServer service mapping has been outdated for a while in favor
of using the NeutronApi service name. Previously, the 2 service mappings
just pointed at the same service template.

This patch properly cleans up any old files still using NeutronServer,
and adds a deprecation for the old mapping. An environment file is added
to enable the old mapping if needed.

This patch will be backported to train, and then the environment file
can be removed in ussuri in a subsequent patch.

Also cleans up an outdated FIXME comment in
overcloud-resource-registry.j2.yaml.

Change-Id: I48b969941c3c6cb1a5b39c8292f461c61b3dabd7
This commit is contained in:
James Slagle
2019-10-02 17:19:40 -04:00
parent 739e379e5b
commit 6687758c7a
20 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sample-env-generator/undercloud-minion.yaml
View File

@@ -192,7 +192,6 @@ environments:
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronServer: OS::Heat::None
OS::TripleO::Services::NeutronSfcApi: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None