Browse Source

Merge "Resolve FIXME for NeutronServer mapping"

tags/12.0.0
Zuul 3 weeks ago
parent
commit
08f029cf7c
20 changed files with 25 additions and 25 deletions
  1. +1
    -1
      ci/environments/multinode-containers.yaml
  2. +1
    -1
      ci/environments/scenario001-multinode-containers.yaml
  3. +1
    -1
      ci/environments/scenario002-multinode-containers.yaml
  4. +1
    -1
      ci/environments/scenario003-multinode-containers.yaml
  5. +1
    -1
      ci/environments/scenario004-multinode-containers.yaml
  6. +1
    -1
      ci/environments/scenario006-multinode-containers.yaml
  7. +1
    -1
      ci/environments/scenario006-multinode.yaml
  8. +1
    -2
      ci/environments/scenario007-multinode-containers.yaml
  9. +0
    -1
      ci/environments/scenario007-standalone.yaml
  10. +1
    -1
      ci/environments/scenario010-multinode-containers.yaml
  11. +1
    -1
      ci/environments/scenario012-multinode-containers.yaml
  12. +0
    -1
      environments/docker-uc-light.yaml
  13. +0
    -1
      environments/neutron-ovs-dvr.yaml
  14. +0
    -1
      environments/services/neutron-ovs-dvr.yaml
  15. +0
    -1
      environments/services/neutron-ovs.yaml
  16. +5
    -0
      environments/services/neutron-server.yaml
  17. +0
    -1
      environments/undercloud/undercloud-minion.yaml
  18. +0
    -7
      overcloud-resource-registry-puppet.j2.yaml
  19. +10
    -0
      releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml
  20. +0
    -1
      sample-env-generator/undercloud-minion.yaml

+ 1
- 1
ci/environments/multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario001-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario002-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario003-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario004-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario006-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario006-multinode.yaml View File

@@ -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

+ 1
- 2
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::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

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

@@ -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

+ 1
- 1
ci/environments/scenario010-multinode-containers.yaml View File

@@ -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

+ 1
- 1
ci/environments/scenario012-multinode-containers.yaml View File

@@ -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

+ 0
- 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::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

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

@@ -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

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

@@ -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

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

@@ -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

+ 5
- 0
environments/services/neutron-server.yaml 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

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

@@ -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

+ 0
- 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::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


+ 10
- 0
releasenotes/notes/deprecate-neutron-server-mapping-af17af3d8e09ade4.yaml 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.

+ 0
- 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

Loading…
Cancel
Save