Browse Source

Rename NeutronMl2PluginBase TripleO service

Rename Tripleo Service for NeutronMl2PluginBase from
OS::TripleO::Docker::NeutronMl2PluginBase to match with other services
as OS::TripleO::Services::NeutronMl2PluginBase.

Change-Id: I38d2fb5e9f0daba4c519343e88cd51e07dd00300
changes/94/755694/4
Purandhar Sairam Mannidi 10 months ago
parent
commit
f65052db5a
  1. 2
      ci/environments/scenario007-multinode-containers.yaml
  2. 2
      ci/environments/scenario007-standalone.yaml
  3. 2
      deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
  4. 2
      deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
  5. 2
      environments/neutron-nuage-config.yaml
  6. 2
      environments/neutron-ovs-dvr.yaml
  7. 2
      environments/services-baremetal/neutron-ovn-dvr-ha.yaml
  8. 3
      environments/services-baremetal/neutron-ovn-ha.yaml
  9. 2
      environments/services/neutron-ovn-dvr-ha.yaml
  10. 2
      environments/services/neutron-ovn-ha.yaml
  11. 2
      environments/services/neutron-ovn-standalone.yaml
  12. 2
      environments/services/neutron-ovs-dvr.yaml
  13. 2
      environments/services/neutron-ovs.yaml
  14. 2
      environments/undercloud.yaml
  15. 2
      overcloud-resource-registry-puppet.j2.yaml

2
ci/environments/scenario007-multinode-containers.yaml

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.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

2
ci/environments/scenario007-standalone.yaml

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.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

2
deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml

@ -44,7 +44,7 @@ parameters:
resources:
NeutronMl2Base:
type: OS::TripleO::Docker::NeutronMl2PluginBase
type: OS::TripleO::Services::NeutronMl2PluginBase
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}

2
deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

@ -40,7 +40,7 @@ parameters:
resources:
NeutronBase:
type: OS::TripleO::Docker::NeutronMl2PluginBase
type: OS::TripleO::Services::NeutronMl2PluginBase
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}

2
environments/neutron-nuage-config.yaml

@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Docker::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
OS::TripleO::Services::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
parameter_defaults:
NeutronNuageNetPartitionName: 'default_name'

2
environments/neutron-ovs-dvr.yaml

@ -5,7 +5,7 @@ resource_registry:
# 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.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

2
environments/services-baremetal/neutron-ovn-dvr-ha.yaml

@ -1,6 +1,6 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
# Disabling Neutron services that overlap with OVN

3
environments/services-baremetal/neutron-ovn-ha.yaml

@ -1,6 +1,6 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
@ -18,6 +18,7 @@ parameter_defaults:
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronEnableDVR: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'

2
environments/services/neutron-ovn-dvr-ha.yaml

@ -1,6 +1,6 @@
# A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

2
environments/services/neutron-ovn-ha.yaml

@ -1,6 +1,6 @@
# A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

2
environments/services/neutron-ovn-standalone.yaml

@ -1,6 +1,6 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

2
environments/services/neutron-ovs-dvr.yaml

@ -3,7 +3,7 @@
# consistent with the default tripleo network templates so some customization
# is likely required for production deployments.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

2
environments/services/neutron-ovs.yaml

@ -1,6 +1,6 @@
# A Heat environment file that deploys ML2/OVS in the overcloud.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

2
environments/undercloud.yaml

@ -18,7 +18,7 @@ resource_registry:
OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml

2
overcloud-resource-registry-puppet.j2.yaml

@ -315,7 +315,7 @@ resource_registry:
OS::TripleO::Services::DesignateWorker: OS::Heat::None
OS::TripleO::Services::DesignateMDNS: OS::Heat::None
OS::TripleO::Services::DesignateSink: OS::Heat::None
OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::Multipathd: OS::Heat::None
OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
OS::TripleO::Services::HAproxyEdge: OS::Heat::None

Loading…
Cancel
Save