diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-03-02 13:05:17 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-03-06 08:43:34 -0500 |
| commit | 67566f2f8c700f8c4b78bfac557f70721a243834 (patch) | |
| tree | 53159fff0898d03579b7d3871c53fbc768654be6 /build/opnfv-puppet-tripleo.patch | |
| parent | 17c3afc75f082e9374eb1344068c792d178c0d35 (diff) | |
Adds OpenDaylight HA (OVSDB Clustering)
OVSDB Clustering changes include:
- Modifications to create an OpenDaylight
VIP for communication between Neutron SB <-> ODL NB.
- OpenDaylight configured in HA mode in THT via puppet-opendaylight
- OVS instances configured with managers pointing to all 3 ODL
instances for HA mode
- Build now points to latest Beryllium release
- Modified puppet-neutron in build to pull latest stable/liberty
JIRA: APEX-107
Change-Id: Iab510db922dfcd2fbd4962b9751cd2f7e5724f44
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/opnfv-puppet-tripleo.patch')
| -rw-r--r-- | build/opnfv-puppet-tripleo.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/build/opnfv-puppet-tripleo.patch b/build/opnfv-puppet-tripleo.patch new file mode 100644 index 00000000..99d3c742 --- /dev/null +++ b/build/opnfv-puppet-tripleo.patch @@ -0,0 +1,62 @@ +From 9f012bc3e4f23fa756f5435ee69e5d51dd6fc874 Mon Sep 17 00:00:00 2001 +From: Tim Rozet <tdrozet@gmail.com> +Date: Thu, 3 Mar 2016 14:36:11 -0500 +Subject: [PATCH] Adds ODL to load balancer + +--- + manifests/loadbalancer.pp | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp +index 2fcfac6..6e13566 100644 +--- a/manifests/loadbalancer.pp ++++ b/manifests/loadbalancer.pp +@@ -247,6 +247,10 @@ + # (optional) Enable or not Redis binding + # Defaults to false + # ++# [*opendaylight*] ++# (optional) Enable or not OpenDaylight binding ++# Defaults to false ++# + class tripleo::loadbalancer ( + $controller_virtual_ip, + $control_virtual_interface, +@@ -299,6 +303,7 @@ class tripleo::loadbalancer ( + $mysql_clustercheck = false, + $rabbitmq = false, + $redis = false, ++ $opendaylight = false, + ) { + + if !$controller_host and !$controller_hosts { +@@ -1044,4 +1049,26 @@ class tripleo::loadbalancer ( + } + } + ++ $opendaylight_api_vip = hiera('opendaylight_api_vip', $controller_virtual_ip) ++ $opendaylight_bind_opts = { ++ "${opendaylight_api_vip}:8081" => [], ++ "${public_virtual_ip}:8081" => [], ++ } ++ ++ if $opendaylight { ++ haproxy::listen { 'opendaylight': ++ bind => $opendaylight_bind_opts, ++ options => { ++ 'balance' => 'source', ++ }, ++ collect_exported => false, ++ } ++ haproxy::balancermember { 'opendaylight': ++ listening_service => 'opendaylight', ++ ports => '8081', ++ ipaddresses => hiera('opendaylight_api_node_ips', $controller_hosts_real), ++ server_names => $controller_hosts_names_real, ++ options => ['check', 'inter 2000', 'rise 2', 'fall 5'], ++ } ++ } + } +-- +2.5.0 + |