Merge "Enables websocket based port status for OpenDaylight"

manifests/haproxy.pp

@@ -758,6 +758,7 @@ class tripleo::haproxy (
     octavia_api_port => 9876,
     octavia_api_ssl_port => 13876,
     opendaylight_api_port => 8081,
+    opendaylight_ws_port => 8185,
     panko_api_port => 8977,
     panko_api_ssl_port => 13977,
     ovn_nbdb_port => 6641,
@@ -1500,6 +1501,24 @@ class tripleo::haproxy (
         'balance' => 'source',
       },
     }
+
+    ::tripleo::haproxy::endpoint { 'opendaylight_ws':
+      internal_ip    => unique([hiera('opendaylight_api_vip', $controller_virtual_ip), $controller_virtual_ip]),
+      service_port   => $ports[opendaylight_ws_port],
+      ip_addresses   => hiera('opendaylight_api_node_ips', $controller_hosts_real),
+      server_names   => hiera('opendaylight_api_node_names', $controller_hosts_names_real),
+      mode           => 'http',
+      listen_options => {
+        # NOTE(jaosorior): Websockets have more overhead in establishing
+        # connections than regular HTTP connections. Also, since it begins
+        # as an HTTP connection and then "upgrades" to a TCP connection, some
+        # timeouts get overridden by others at certain times of the connection.
+        # The following values were taken from the following site:
+        # http://blog.haproxy.com/2012/11/07/websockets-load-balancing-with-haproxy/
+        'timeout' => ['connect 5s', 'client 25s', 'server 25s', 'tunnel 3600s'],
+        'balance' => 'source',
+      },
+    }
   }
 
   if $octavia {

manifests/profile/base/neutron/plugins/ml2/opendaylight.pp

@@ -55,12 +55,10 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
   if $step >= 4 {
     if ! $odl_url_ip { fail('OpenDaylight API VIP is Empty') }
 
-    # TODO(trozet) remove odl_features once ODL BZ: 9256, 9147 are fixed
     class { '::neutron::plugins::ml2::opendaylight':
       odl_username => $odl_username,
       odl_password => $odl_password,
       odl_url      => "${conn_proto}://${odl_url_ip}:${odl_port}/controller/nb/v2/neutron",
-      odl_features => 'False';
     }
   }
 }

releasenotes/notes/enables_opendaylight_port_status-1ee052b299b36b83.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes OpenDaylight port status to now work correctly via websocket
+    connection.