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
This commit is contained in:
parent
698d360cd0
commit
f65052db5a
|
@ -1,5 +1,5 @@
|
||||||
resource_registry:
|
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::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,5 +1,5 @@
|
||||||
resource_registry:
|
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::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
|
||||||
|
|
|
@ -44,7 +44,7 @@ parameters:
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
NeutronMl2Base:
|
NeutronMl2Base:
|
||||||
type: OS::TripleO::Docker::NeutronMl2PluginBase
|
type: OS::TripleO::Services::NeutronMl2PluginBase
|
||||||
properties:
|
properties:
|
||||||
EndpointMap: {get_param: EndpointMap}
|
EndpointMap: {get_param: EndpointMap}
|
||||||
ServiceData: {get_param: ServiceData}
|
ServiceData: {get_param: ServiceData}
|
||||||
|
|
|
@ -40,7 +40,7 @@ parameters:
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
NeutronBase:
|
NeutronBase:
|
||||||
type: OS::TripleO::Docker::NeutronMl2PluginBase
|
type: OS::TripleO::Services::NeutronMl2PluginBase
|
||||||
properties:
|
properties:
|
||||||
EndpointMap: {get_param: EndpointMap}
|
EndpointMap: {get_param: EndpointMap}
|
||||||
ServiceData: {get_param: ServiceData}
|
ServiceData: {get_param: ServiceData}
|
||||||
|
|
|
@ -7,7 +7,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||||
# Override the NeutronCorePlugin to use Nuage
|
# Override the NeutronCorePlugin to use Nuage
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
|
OS::TripleO::Services::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronNuageNetPartitionName: 'default_name'
|
NeutronNuageNetPartitionName: 'default_name'
|
||||||
|
|
|
@ -5,7 +5,7 @@ resource_registry:
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# 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
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# 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::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.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
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
||||||
resource_registry:
|
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::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
|
||||||
OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
|
OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
|
||||||
# Disabling Neutron services that overlap with OVN
|
# Disabling Neutron services that overlap with OVN
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
||||||
resource_registry:
|
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::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
|
||||||
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
||||||
|
@ -18,6 +18,7 @@ parameter_defaults:
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
OVNQosDriver: ovn-qos
|
||||||
|
NeutronEnableDVR: false
|
||||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: 'geneve'
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
|
# A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
|
||||||
resource_registry:
|
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::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
|
||||||
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
|
# A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
|
||||||
resource_registry:
|
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::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
|
||||||
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
||||||
resource_registry:
|
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::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
|
||||||
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-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
|
OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# consistent with the default tripleo network templates so some customization
|
# consistent with the default tripleo network templates so some customization
|
||||||
# is likely required for production deployments.
|
# is likely required for production deployments.
|
||||||
resource_registry:
|
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::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
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# A Heat environment file that deploys ML2/OVS in the overcloud.
|
# A Heat environment file that deploys ML2/OVS in the overcloud.
|
||||||
resource_registry:
|
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::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
|
||||||
|
|
|
@ -18,7 +18,7 @@ resource_registry:
|
||||||
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::NeutronL3Agent: ../deployment/neutron/neutron-l3-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::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
|
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
|
||||||
|
|
||||||
|
|
|
@ -315,7 +315,7 @@ 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
|
||||||
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::Multipathd: OS::Heat::None
|
||||||
OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
|
OS::TripleO::Services::GlanceApiEdge: OS::Heat::None
|
||||||
OS::TripleO::Services::HAproxyEdge: OS::Heat::None
|
OS::TripleO::Services::HAproxyEdge: OS::Heat::None
|
||||||
|
|
Loading…
Reference in New Issue