Split ovn plugin and northd configuration

This allows us to use the composable services interfaces to handle
providing the IP address for northd, and will be more flexible in
the event folks want to deploy northd/ovndb on a different node to
the neutron plugin.

This also adds ovn_northd to the haproxy configuration so we can access
it via the ovn_northd_vip in other service profiles.  Note we need
to ensure the haproxy config only hits the bootstrap node as northd
won't be running on the other nodes.

Change-Id: I9af7bd837c340c3df016fc7ad4238b2941ba7a95
Partial-Bug: #1634171

1 files changed, 47 insertions, 0 deletions

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index ededc76..b9c8835 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -271,6 +271,10 @@
 #  (optional) Enable or not OpenDaylight binding
 #  Defaults to hiera('opendaylight_api_enabled', false)
 #
+# [*ovn_dbs*]
+#  (optional) Enable or not OVN northd binding
+#  Defaults to hiera('ovn_dbs_enabled', false)
+#
 # [*zaqar_ws*]
 #  (optional) Enable or not Zaqar Websockets binding
 #  Defaults to false
@@ -375,6 +379,10 @@
 #  (optional) Specify the network panko is running on.
 #  Defaults to hiera('panko_api_network', undef)
 #
+# [*ovn_dbs_network*]
+#  (optional) Specify the network ovn_dbs is running on.
+#  Defaults to hiera('ovn_dbs_network', undef)
+#
 # [*sahara_network*]
 #  (optional) Specify the network sahara is running on.
 #  Defaults to hiera('sahara_api_network', undef)
@@ -436,6 +444,8 @@
 #    'nova_novnc_ssl_port' (Defaults to 13080)
 #    'panko_api_port' (Defaults to 8779)
 #    'panko_api_ssl_port' (Defaults to 13779)
+#    'ovn_nbdb_port' (Defaults to 6641)
+#    'ovn_sbdb_port' (Defaults to 6642)
 #    'sahara_api_port' (Defaults to 8386)
 #    'sahara_api_ssl_port' (Defaults to 13386)
 #    'swift_proxy_port' (Defaults to 8080)
@@ -509,6 +519,7 @@ class tripleo::haproxy (
   $zaqar_api                   = hiera('zaqar_api_enabled', false),
   $ceph_rgw                    = hiera('ceph_rgw_enabled', false),
   $opendaylight                = hiera('opendaylight_api_enabled', false),
+  $ovn_dbs                     = hiera('ovn_dbs_enabled', false),
   $zaqar_ws                    = hiera('zaqar_api_enabled', false),
   $ui                          = hiera('enable_ui', false),
   $aodh_network                = hiera('aodh_api_network', undef),
@@ -534,6 +545,7 @@ class tripleo::haproxy (
   $nova_novncproxy_network     = hiera('nova_vnc_proxy_network', undef),
   $nova_osapi_network          = hiera('nova_api_network', undef),
   $panko_network               = hiera('panko_api_network', undef),
+  $ovn_dbs_network             = hiera('ovn_dbs_network', undef),
   $sahara_network              = hiera('sahara_api_network', undef),
   $swift_proxy_server_network  = hiera('swift_proxy_network', undef),
   $trove_network               = hiera('trove_api_network', undef),
@@ -583,6 +595,8 @@ class tripleo::haproxy (
     nova_novnc_ssl_port => 13080,
     panko_api_port => 8779,
     panko_api_ssl_port => 13779,
+    ovn_nbdb_port => 6641,
+    ovn_sbdb_port => 6642,
     sahara_api_port => 8386,
     sahara_api_ssl_port => 13386,
     swift_proxy_port => 8080,
@@ -1311,6 +1325,39 @@ class tripleo::haproxy (
     }
   }
 
+
+  if $ovn_dbs {
+    # FIXME: is this config enough to ensure we only hit the first node in
+    # ovn_northd_node_ips ?
+    $ovn_db_listen_options = {
+      'option'         => [ 'tcpka' ],
+      'timeout client' => '90m',
+      'timeout server' => '90m',
+      'stick-table'    => 'type ip size 1000',
+      'stick'          => 'on dst',
+    }
+    ::tripleo::haproxy::endpoint { 'ovn_nbdb':
+      public_virtual_ip => $public_virtual_ip,
+      internal_ip       => hiera('ovn_dbs_vip', $controller_virtual_ip),
+      service_port      => $ports[ovn_nbdb_port],
+      ip_addresses      => hiera('ovn_dbs_node_ips', $controller_hosts_real),
+      server_names      => hiera('ovn_dbs_node_names', $controller_hosts_names_real),
+      service_network   => $ovn_dbs_network,
+      listen_options    => $ovn_db_listen_options,
+      mode              => 'tcp'
+    }
+    ::tripleo::haproxy::endpoint { 'ovn_sbdb':
+      public_virtual_ip => $public_virtual_ip,
+      internal_ip       => hiera('ovn_dbs_vip', $controller_virtual_ip),
+      service_port      => $ports[ovn_sbdb_port],
+      ip_addresses      => hiera('ovn_dbs_node_ips', $controller_hosts_real),
+      server_names      => hiera('ovn_dbs_node_names', $controller_hosts_names_real),
+      service_network   => $ovn_dbs_network,
+      listen_options    => $ovn_db_listen_options,
+      mode              => 'tcp'
+    }
+  }
+
   if $zaqar_ws {
     ::tripleo::haproxy::endpoint { 'zaqar_ws':
       public_virtual_ip         => $public_virtual_ip,