Merge "Allow Undercloud to be deployed with Ml2 OVN"
This commit is contained in:
commit
f1c6c6d302
26
environments/services/undercloud-neutron-ovn-dhcp.yaml
Normal file
26
environments/services/undercloud-neutron-ovn-dhcp.yaml
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# A Heat environment file which can be used to enable
|
||||||
|
# neutron Ml2 OVN services on Undercloud
|
||||||
|
resource_registry:
|
||||||
|
# OVN services
|
||||||
|
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
|
||||||
|
|
||||||
|
# Disabling Neutron services that overlap with OVN
|
||||||
|
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||||
|
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||||
|
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||||
|
|
||||||
|
parameter_defaults:
|
||||||
|
OVNNeutronSyncMode: log
|
||||||
|
NeutronRpcWorkers: 1
|
||||||
|
UndercloudParameters:
|
||||||
|
OVNCMSOptions: "enable-chassis-as-gw"
|
||||||
|
OVNDnsServers: []
|
||||||
|
DhcpAgentNotification: false
|
||||||
|
NeutronServicePlugins: 'ovn-router,segments'
|
||||||
|
NeutronMechanismDrivers: ['ovn', 'baremetal']
|
||||||
|
NeutronPluginExtensions: "port_security,dns"
|
||||||
|
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
|
||||||
|
NeutronTypeDrivers: ['geneve', 'vxlan', 'vlan', 'flat']
|
@ -14,6 +14,11 @@ resource_registry:
|
|||||||
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::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
OS::TripleO::Services::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
||||||
|
|
||||||
|
# Disable OVN services
|
||||||
|
OS::TripleO::Services::OVNController: OS::Heat::None
|
||||||
|
OS::TripleO::Services::OVNDBs: OS::Heat::None
|
||||||
|
OS::TripleO::Services::OVNMetadataAgent: OS::Heat::None
|
||||||
|
|
||||||
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
|
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::HeatEphemeral: ../deployment/heat/heat-ephemeral-container-ansible.yaml
|
OS::TripleO::Services::HeatEphemeral: ../deployment/heat/heat-ephemeral-container-ansible.yaml
|
||||||
|
|
||||||
|
@ -42,6 +42,9 @@
|
|||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronOvsAgent
|
- OS::TripleO::Services::NeutronOvsAgent
|
||||||
|
- OS::TripleO::Services::OVNController
|
||||||
|
- OS::TripleO::Services::OVNDBs
|
||||||
|
- OS::TripleO::Services::OVNMetadataAgent
|
||||||
- OS::TripleO::Services::OpenStackClients
|
- OS::TripleO::Services::OpenStackClients
|
||||||
- OS::TripleO::Services::OsloMessagingNotify
|
- OS::TripleO::Services::OsloMessagingNotify
|
||||||
- OS::TripleO::Services::OsloMessagingRpc
|
- OS::TripleO::Services::OsloMessagingRpc
|
||||||
|
@ -45,6 +45,9 @@
|
|||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronOvsAgent
|
- OS::TripleO::Services::NeutronOvsAgent
|
||||||
|
- OS::TripleO::Services::OVNController
|
||||||
|
- OS::TripleO::Services::OVNDBs
|
||||||
|
- OS::TripleO::Services::OVNMetadataAgent
|
||||||
- OS::TripleO::Services::OpenStackClients
|
- OS::TripleO::Services::OpenStackClients
|
||||||
- OS::TripleO::Services::OsloMessagingNotify
|
- OS::TripleO::Services::OsloMessagingNotify
|
||||||
- OS::TripleO::Services::OsloMessagingRpc
|
- OS::TripleO::Services::OsloMessagingRpc
|
||||||
|
Loading…
Reference in New Issue
Block a user