Support HA for OVN DBs containers using pacemaker bundle
ovn-dbs pacemaker bundle resources are created for supporting Master/Slave HA. puppet-tripleo already supports creating ovn-dbs bundle resources. The heat template added in this patch makes use of this. Closes-bug: #1699085 Change-Id: I23c2d312cfb144f9afc14f0982a92670dc29d74c
This commit is contained in:
parent
f2d7d4d733
commit
444a39f598
140
docker/services/pacemaker/ovn-dbs.yaml
Normal file
140
docker/services/pacemaker/ovn-dbs.yaml
Normal file
@ -0,0 +1,140 @@
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized OVN DBs service managed by pacemaker
|
||||
|
||||
parameters:
|
||||
DockerOvnDbsImage:
|
||||
description: image
|
||||
type: string
|
||||
DockerOvnDbsConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
type: json
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
type: string
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
OVNNorthboundServerPort:
|
||||
description: Port of the OVN Northbound DB server
|
||||
type: number
|
||||
default: 6641
|
||||
OVNSouthboundServerPort:
|
||||
description: Port of the OVN Southbound DB server
|
||||
type: number
|
||||
default: 6642
|
||||
|
||||
resources:
|
||||
|
||||
ContainersCommon:
|
||||
type: ./../containers-common.yaml
|
||||
|
||||
OVNDbsBase:
|
||||
type: ../../../puppet/services/pacemaker/ovn-dbs.yaml
|
||||
properties:
|
||||
EndpointMap: {get_param: EndpointMap}
|
||||
ServiceData: {get_param: ServiceData}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
DefaultPasswords: {get_param: DefaultPasswords}
|
||||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
OVNNorthboundServerPort: {get_param: OVNNorthboundServerPort}
|
||||
OVNSouthboundServerPort: {get_param: OVNSouthboundServerPort}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the OVN Dbs HA role.
|
||||
value:
|
||||
service_name: {get_attr: [OVNDbsBase, role_data, service_name]}
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [OVNDbsBase, role_data, config_settings]
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image: {get_param: DockerOvnDbsImage}
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort}
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
|
||||
step_config: ''
|
||||
service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: 'ovn_dbs'
|
||||
puppet_tags: 'exec'
|
||||
step_config: ''
|
||||
config_image: &ovn_dbs_config_image {get_param: DockerOvnDbsConfigImage}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ovn_dbs.json:
|
||||
command: /usr/sbin/pacemaker_remoted
|
||||
config_files:
|
||||
- dest: /etc/libqb/force-filesystem-sockets
|
||||
source: /dev/null
|
||||
owner: root
|
||||
perm: '0644'
|
||||
- source: "/var/lib/kolla/config_files/src/*"
|
||||
dest: "/"
|
||||
merge: true
|
||||
preserve_properties: true
|
||||
optional: true
|
||||
docker_config:
|
||||
step_3:
|
||||
ovn_dbs_init_bundle:
|
||||
start_order: 1
|
||||
detach: false
|
||||
net: host
|
||||
user: root
|
||||
config_volume: 'ovn_dbs_init_bundle'
|
||||
command:
|
||||
- '/bin/bash'
|
||||
- '-c'
|
||||
- str_replace:
|
||||
template:
|
||||
list_join:
|
||||
- '; '
|
||||
- - "cp -a /tmp/puppet-etc/* /etc/puppet; echo '{\"step\": 3}' > /etc/puppet/hieradata/docker.json"
|
||||
- "FACTER_uuid=docker puppet apply --tags file,file_line,concat,augeas,TAGS -v -e 'CONFIG'"
|
||||
params:
|
||||
TAGS: 'pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ip,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
|
||||
CONFIG:
|
||||
list_join:
|
||||
- ';'
|
||||
- - 'include ::tripleo::profile::base::pacemaker'
|
||||
- 'include ::tripleo::profile::pacemaker::ovn_dbs_bundle'
|
||||
image: *ovn_dbs_config_image
|
||||
volumes:
|
||||
- /etc/hosts:/etc/hosts:ro
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- /etc/puppet:/tmp/puppet-etc:ro
|
||||
- /usr/share/openstack-puppet/modules:/usr/share/openstack-puppet/modules:ro
|
||||
- /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
host_prep_tasks:
|
||||
- name: create persistent directories
|
||||
file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
with_items:
|
||||
- /var/log/containers/openvswitch
|
||||
- /var/lib/openvswitch/ovn
|
||||
upgrade_tasks:
|
||||
- name: Stop and disable ovn-northd service
|
||||
tags: step2
|
||||
service: name=ovn-northd state=stopped enabled=no
|
28
environments/services-docker/neutron-ovn-ha.yaml
Normal file
28
environments/services-docker/neutron-ovn-ha.yaml
Normal file
@ -0,0 +1,28 @@
|
||||
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
|
||||
resource_registry:
|
||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
|
||||
OS::TripleO::Services::OVNController: ../../docker/services/ovn-controller.yaml
|
||||
OS::TripleO::Services::OVNDBs: ../../docker/services/pacemaker/ovn-dbs.yaml
|
||||
# Disabling Neutron services that overlap with OVN
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
NeutronMechanismDrivers: ovn
|
||||
OVNVifType: ovs
|
||||
OVNNeutronSyncMode: log
|
||||
OVNQosDriver: ovn-qos
|
||||
OVNTunnelEncapType: geneve
|
||||
NeutronEnableDHCPAgent: false
|
||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||
NeutronNetworkType: 'geneve'
|
||||
NeutronServicePlugins: 'qos,ovn-router'
|
||||
NeutronVniRanges: ['1:65536', ]
|
||||
# TODO (numans) - This is temporary and needs to be handled in tripleo-common
|
||||
DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest'
|
||||
DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest'
|
@ -2,3 +2,4 @@
|
||||
features:
|
||||
- Support containerized ovn-controller
|
||||
- Support containerized OVN Dbs without HA
|
||||
- Support containerized OVN DBs with HA
|
||||
|
Loading…
x
Reference in New Issue
Block a user