SSL parameter setting in haproxy

Pass SSL parameters to haproxy. Change-Id: I9b9c9da9e6ef473ac9db617aaa86e38decd77c3b Partial-Bug: #1569033
Juniper · Apr 18, 2016 · 2078559 · 2078559
1 parent d58f5da
commit 2078559
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/loadbalancer_agent.py b/src/config/svc-monitor/svc_monitor/loadbalancer_agent.py
@@ -393,6 +393,9 @@ def listener_get_reqdict(self, listener):
                'protocol': props['protocol'],
                'loadbalancer_id': listener.loadbalancer,
                'admin_state_up': props['admin_state'],
+               'connection_limit': props['connection_limit'],
+               'default_tls_container': props['default_tls_container'],
+               'sni_containers': props['sni_containers'],
                'status': self._get_object_status(listener)}
 
         return res

diff --git a/src/config/svc-monitor/svc_monitor/services/loadbalancer/drivers/ha_proxy/haproxy_config.py b/src/config/svc-monitor/svc_monitor/services/loadbalancer/drivers/ha_proxy/haproxy_config.py
@@ -2,12 +2,13 @@
 
 PROTO_HTTP = 'HTTP'
 PROTO_HTTPS = 'HTTPS'
+PROTO_TERMINATED_HTTPS = 'TERMINATED_HTTPS'
 
 PROTO_MAP = {
     'TCP': 'tcp',
     'HTTP': 'http',
     'HTTPS': 'http',
-    'TERMINATED_HTTPS': 'terminated_https'
+    'TERMINATED_HTTPS': 'http'
 }
 
 LB_METHOD_MAP = {
@@ -121,8 +122,8 @@ def set_v2_frontend_backend(lb):
             continue
 
         ssl = ''
-        if ll.params['protocol'] == PROTO_HTTPS:
-            ssl = 'ssl crt %s no-sslv3' % crt_file
+        if ll.params['protocol'] == PROTO_TERMINATED_HTTPS:
+            ssl = 'ssl crt %s no-sslv3' % ll.params['default_tls_container']
 
         lconf = [
             'frontend %s' % ll.uuid,