5f313f27c9
Presently the ovn-controller service (puppet/services/neutron-compute-plugin-ovn.yaml) is started only on compute nodes. But for the cases where the controller nodes provide the north/south traffic, we need ovn-controller service runninng in controller nodes as well. This patch - Renames the neutron-compute-plugin-ovn.yaml to ovn-controller.yaml which makes more sense and sets the service name as 'ovn-controller'. - Adds the service 'ovn-controller' to Controller and Compute roles. - Adds the missing 'upgrade_tasks' section in ovn-dbs.yaml and ovn-controller.yaml Depends-On: Ie3f09dc70a582f3d14de093043e232820f837bc3 Depends-On: Ide11569d81f5f28bafccc168b624be505174fc53 Change-Id: Ib7747406213d18fd65b86820c1f86ee7c39f7cf5
77 lines
3.5 KiB
YAML
77 lines
3.5 KiB
YAML
resource_registry:
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml
|
|
OS::TripleO::Services::HAproxy: ../../puppet/services/pacemaker/haproxy.yaml
|
|
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
|
OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml
|
|
OS::TripleO::Services::Keepalived: OS::Heat::None
|
|
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
|
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
|
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
|
# Disable neutron services not required for OVN and enable services required for OVN.
|
|
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
|
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
|
|
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
|
OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml
|
|
OS::TripleO::Services::OVNDBs: ../../puppet/services/ovn-dbs.yaml
|
|
|
|
parameter_defaults:
|
|
ControllerServices:
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::Keystone
|
|
- OS::TripleO::Services::GlanceApi
|
|
- OS::TripleO::Services::HeatApi
|
|
- OS::TripleO::Services::HeatApiCfn
|
|
- OS::TripleO::Services::HeatApiCloudwatch
|
|
- OS::TripleO::Services::HeatEngine
|
|
- OS::TripleO::Services::MySQL
|
|
- OS::TripleO::Services::MySQLClient
|
|
- OS::TripleO::Services::NeutronServer
|
|
- OS::TripleO::Services::NeutronCorePlugin
|
|
- OS::TripleO::Services::OVNDBs
|
|
- OS::TripleO::Services::OVNController
|
|
- OS::TripleO::Services::RabbitMQ
|
|
- OS::TripleO::Services::HAproxy
|
|
- OS::TripleO::Services::Keepalived
|
|
- OS::TripleO::Services::Memcached
|
|
- OS::TripleO::Services::Pacemaker
|
|
- OS::TripleO::Services::NovaConductor
|
|
- OS::TripleO::Services::NovaApi
|
|
- OS::TripleO::Services::NovaPlacement
|
|
- OS::TripleO::Services::NovaMetadata
|
|
- OS::TripleO::Services::NovaScheduler
|
|
- OS::TripleO::Services::Ntp
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::NovaCompute
|
|
- OS::TripleO::Services::NovaLibvirt
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
ControllerExtraConfig:
|
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
|
# For OVN.
|
|
NeutronMechanismDrivers: ovn
|
|
OVNVifType: ovs
|
|
OVNNeutronSyncMode: log
|
|
OVNQosDriver: ovn-qos
|
|
OVNTunnelEncapType: geneve
|
|
NeutronEnableDHCPAgent: false
|
|
NeutronTypeDrivers: 'geneve,vlan,flat,vxlan'
|
|
NeutronNetworkType: 'geneve'
|
|
NeutronServicePlugins: 'qos,networking_ovn.l3.l3_ovn.OVNL3RouterPlugin'
|
|
NeutronVniRanges: ['1:65536', ]
|
|
OVNBridgeMappings: 'datacentre:br-ex'
|
|
Debug: true
|
|
# we don't deploy Swift so we switch to file backend.
|
|
GlanceBackend: 'file'
|
|
KeystoneTokenProvider: 'fernet'
|
|
SwiftCeilometerPipelineEnabled: false
|