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 e8211bdb7c
commit ce0ee4df3c
21 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/multinode-containers.yaml
View File

@ -17,7 +17,7 @@ parameter_defaults:
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario001-multinode-containers.yaml
View File

@ -43,7 +43,7 @@ parameter_defaults:
- OS::TripleO::Services::HeatEngine - OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario002-multinode-containers.yaml
View File

@ -34,7 +34,7 @@ parameter_defaults:
- OS::TripleO::Services::HeatEngine - OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario003-multinode-containers.yaml
View File

@ -35,7 +35,7 @@ parameter_defaults:
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario004-multinode-containers.yaml
View File

@ -51,7 +51,7 @@ parameter_defaults:
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario006-multinode-containers.yaml
View File

@ -19,7 +19,7 @@ parameter_defaults:
- OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicPxe
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario006-multinode.yaml
View File

@ -12,7 +12,7 @@ resource_registry:
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronServer: OS::Heat::None OS::TripleO::Services::NeutronApi: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::RabbitMQ: OS::Heat::None OS::TripleO::Services::RabbitMQ: OS::Heat::None

3
ci/environments/scenario007-multinode-containers.yaml
View File

@ -2,7 +2,6 @@ resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml
@ -48,7 +47,7 @@ parameter_defaults:
- OS::TripleO::Services::HeatEngine - OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronL3Agent

1
ci/environments/scenario007-standalone.yaml
View File

@ -1,6 +1,5 @@
resource_registry: resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml

2
ci/environments/scenario008-multinode-containers.yaml
View File

@ -28,7 +28,7 @@ parameter_defaults:
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaConductor

2
ci/environments/scenario010-multinode-containers.yaml
View File

@ -39,7 +39,7 @@ parameter_defaults:
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

2
ci/environments/scenario012-multinode-containers.yaml
View File

@ -32,7 +32,7 @@ parameter_defaults:
- OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicPxe
- OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNController

1
environments/docker-uc-light.yaml
View File

@ -19,7 +19,6 @@ resource_registry:
OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml

1
environments/neutron-ovs-dvr.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
# see https://review.opendev.org/#/c/563443 # see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml

1
environments/services/neutron-ovs-dvr.yaml
View File

@ -5,7 +5,6 @@ resource_registry:
# see https://review.opendev.org/#/c/563443 # see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml

1
environments/services/neutron-ovs.yaml
View File

@ -8,7 +8,6 @@ resource_registry:
# see https://review.opendev.org/#/c/563443 # see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml

5
environments/services/neutron-server.yaml Normal file
View File

@ -0,0 +1,5 @@
# DEPRECATED. This file will be removed in the ussuri release as the
# OS::TripleO::Services::NeutronServer is removed in favor of the
# OS::TripleO::Services::NeutronApi service.
resource_registry:
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml

1
environments/undercloud/undercloud-minion.yaml
View File

@ -172,7 +172,6 @@ resource_registry:
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: 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::NeutronSfcApi: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None

7
overcloud-resource-registry-puppet.j2.yaml
View File

@ -143,9 +143,6 @@ resource_registry:
OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::OVNMetadataAgent: deployment/ovn/ovn-metadata-container-puppet.yaml OS::TripleO::Services::OVNMetadataAgent: deployment/ovn/ovn-metadata-container-puppet.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: deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronApi: deployment/neutron/neutron-api-container-puppet.yaml OS::TripleO::Services::NeutronApi: deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronCorePlugin: deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
# can be the same as NeutronCorePlugin but some vendors install different # can be the same as NeutronCorePlugin but some vendors install different
@ -328,10 +325,6 @@ resource_registry:
OS::TripleO::Services::DesignateWorker: OS::Heat::None OS::TripleO::Services::DesignateWorker: OS::Heat::None
OS::TripleO::Services::DesignateMDNS: OS::Heat::None OS::TripleO::Services::DesignateMDNS: OS::Heat::None
OS::TripleO::Services::DesignateSink: OS::Heat::None OS::TripleO::Services::DesignateSink: OS::Heat::None
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::Multipathd: OS::Heat::None OS::TripleO::Services::Multipathd: OS::Heat::None

10
releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml Normal file
View File

@ -0,0 +1,10 @@
---
deprecations:
- |
The OS::TripleO::Services::NeutronServer service mapping is deprecated in
favor of using OS::TripleO::Services::NeutronApi. Any role definitions
still using OS::TripleO::Services::NeutronServer need to either be updated
to use OS::TripleO::Services::NeutronApi instead, or they can make use of
the environment file at environments/services/neutron-server.yaml to enable
the old mapping. The environment file will be removed in the ussuri
release.

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

@ -195,7 +195,6 @@ environments:
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
OS::TripleO::Services::NeutronOvsAgent: 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::NeutronSfcApi: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None