diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index f68f809240..aa0f257d17 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -17,7 +17,7 @@ parameter_defaults: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index e4a4ab3e42..28b3142b2a 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -39,7 +39,7 @@ parameter_defaults: - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 8b82291b7c..00b0159d08 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -33,7 +33,7 @@ parameter_defaults: - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index 348f02a557..ee058041fb 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/ci/environments/scenario003-multinode-containers.yaml @@ -35,7 +35,7 @@ parameter_defaults: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index afaf14b6c7..0b0613cc53 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -51,7 +51,7 @@ parameter_defaults: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml index 2b600a4b76..04f313320f 100644 --- a/ci/environments/scenario006-multinode-containers.yaml +++ b/ci/environments/scenario006-multinode-containers.yaml @@ -19,7 +19,7 @@ parameter_defaults: - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario006-multinode.yaml b/ci/environments/scenario006-multinode.yaml index bcf07970d9..f5b3a2639b 100644 --- a/ci/environments/scenario006-multinode.yaml +++ b/ci/environments/scenario006-multinode.yaml @@ -12,7 +12,7 @@ resource_registry: OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: 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::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::RabbitMQ: OS::Heat::None diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 258ad1df2c..c4bf52e728 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -2,7 +2,6 @@ resource_registry: 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::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::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml @@ -43,7 +42,7 @@ parameter_defaults: - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL3Agent diff --git a/ci/environments/scenario007-standalone.yaml b/ci/environments/scenario007-standalone.yaml index dcfcc55df1..247e4aaa7a 100644 --- a/ci/environments/scenario007-standalone.yaml +++ b/ci/environments/scenario007-standalone.yaml @@ -1,6 +1,5 @@ resource_registry: 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::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index e1f7291d4b..590d32c542 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -39,7 +39,7 @@ parameter_defaults: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/ci/environments/scenario012-multinode-containers.yaml b/ci/environments/scenario012-multinode-containers.yaml index 4b646988a7..1570535c7a 100644 --- a/ci/environments/scenario012-multinode-containers.yaml +++ b/ci/environments/scenario012-multinode-containers.yaml @@ -32,7 +32,7 @@ parameter_defaults: - OS::TripleO::Services::IronicPxe - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer + - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml index 1599d25f5a..52efd80879 100644 --- a/environments/docker-uc-light.yaml +++ b/environments/docker-uc-light.yaml @@ -19,7 +19,6 @@ resource_registry: 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::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::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index b5bd624062..5a0423e80f 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/environments/neutron-ovs-dvr.yaml @@ -7,7 +7,6 @@ resource_registry: # see https://review.opendev.org/#/c/563443 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::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml index 4637c50e73..1385277464 100644 --- a/environments/services/neutron-ovs-dvr.yaml +++ b/environments/services/neutron-ovs-dvr.yaml @@ -5,7 +5,6 @@ resource_registry: # see https://review.opendev.org/#/c/563443 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::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml index a4c3b22bbd..3eb6e69b43 100644 --- a/environments/services/neutron-ovs.yaml +++ b/environments/services/neutron-ovs.yaml @@ -8,7 +8,6 @@ resource_registry: # see https://review.opendev.org/#/c/563443 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::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml OS::TripleO::Services::NeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml diff --git a/environments/services/neutron-server.yaml b/environments/services/neutron-server.yaml new file mode 100644 index 0000000000..b3a4aa7eeb --- /dev/null +++ b/environments/services/neutron-server.yaml @@ -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 diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index b755d25d6d..78b32317e1 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -169,7 +169,6 @@ resource_registry: OS::TripleO::Services::NeutronMetadataAgent: 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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c819160990..46f3ccde96 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -143,9 +143,6 @@ resource_registry: OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None 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::NeutronCorePlugin: deployment/neutron/neutron-plugin-ml2-container-puppet.yaml # can be the same as NeutronCorePlugin but some vendors install different @@ -323,10 +320,6 @@ resource_registry: OS::TripleO::Services::DesignateWorker: OS::Heat::None OS::TripleO::Services::DesignateMDNS: 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::Services::Multipathd: OS::Heat::None diff --git a/releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml b/releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml new file mode 100644 index 0000000000..41658ec3f1 --- /dev/null +++ b/releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml @@ -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. diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 09d2e19da8..793a8c87d6 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -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