Merge "Increasing bufsize and maxrewrite in haproxy config Closes-Bug…

…: 1458012" into R2.20
Juniper · May 30, 2015 · b38a6f2 · b38a6f2
2 parents 532a93b + 5ec9fdb
commit b38a6f2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py
@@ -162,6 +162,8 @@ def fixup_restart_haproxy_in_all_cfgm(nworkers):
                 local("sed -i -e '/^#contrail-config-marker-start/,/^#contrail-config-marker-end/d' %s" %(tmp_fname))
                 local("sed -i -e 's/frontend\s*main\s*\*:5000/frontend  main *:5001/' %s" %(tmp_fname))
                 local("sed -i -e 's/ssl-relay 0.0.0.0:8443/ssl-relay 0.0.0.0:5002/' %s" %(tmp_fname))
+                local('sed -i "/^global/a\\        tune.bufsize 16384" %s' % tmp_fname)
+                local('sed -i "/^global/a\\        tune.maxrewrite 1024" %s' % tmp_fname)
             # ...generate new ones
             cfg_file = open(tmp_fname, 'a')
             cfg_file.write(haproxy_config)
@@ -342,6 +344,8 @@ def fixup_restart_haproxy_in_one_compute(compute_host_string):
                    %(tmp_fname))
             local("sed -i -e 's/*:5000/*:5001/' %s" %(tmp_fname))
             local("sed -i -e 's/ssl-relay 0.0.0.0:8443/ssl-relay 0.0.0.0:5002/' %s" %(tmp_fname))
+            local('sed -i "/^global/a\\        tune.bufsize 16384" %s' % tmp_fname)
+            local('sed -i "/^global/a\\        tune.maxrewrite 1024" %s' % tmp_fname)
         # ...generate new ones
         compute_haproxy = compute_haproxy_template.safe_substitute({
             '__contrail_hap_user__': 'haproxy',
@@ -427,6 +431,8 @@ def  fixup_restart_haproxy_in_all_openstack():
                        %(tmp_fname))
                 local("sed -i -e 's/*:5000/*:5001/' %s" %(tmp_fname))
                 local("sed -i -e 's/ssl-relay 0.0.0.0:8443/ssl-relay 0.0.0.0:5002/' %s" %(tmp_fname))
+                local('sed -i "/^global/a\\        tune.bufsize 16384" %s' % tmp_fname)
+                local('sed -i "/^global/a\\        tune.maxrewrite 1024" %s' % tmp_fname)
             # ...generate new ones
             openstack_haproxy = openstack_haproxy_template.safe_substitute({
                 '__contrail_hap_user__': 'haproxy',