Set connection_retry_interval back up to 1200

Currently the connection_max_retries setting is set to 300 or 5
minutes. We know that some test nodepool instances can take up to
18 minutes for a VM to boot.
This patch increases the connection_max_retries timeout back up to
1200 or 20 minutes to accomidate those slow hosts.
This will avoid unnecessary job failures[1].
It also increases the check_timeout from 60 seconds to 180 and drops
the check_interval down to 1 second.

[1] https://logs.opendev.org/37/673337/12/check/octavia-v2-dsvm-tls-barbican/ \
    b512ea7/controller/logs/screen-o-cw.txt.gz#_Aug_10_02_43_54_823712

Change-Id: Ib5635d78c97f4ea1d91af588ea582ba5cb20de56
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d342aff..42643ed 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -97,10 +97,15 @@
           $OCTAVIA_CONF:
             haproxy_amphora:
               # Set these higher for non-nested virt nodepool instances
-              connection_max_retries: 300
+              connection_max_retries: 1200
               build_active_retries: 300
             amphora_agent:
               forward_all_logs: True
+        test-config:
+          "$TEMPEST_CONFIG":
+            load_balancer:
+              check_interval: 1
+              check_timeout: 180
       devstack_services:
         neutron-qos: true
       devstack_plugins:
@@ -425,12 +430,6 @@
         OCTAVIA_AMP_BASE_OS: centos
         OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
         OCTAVIA_AMP_IMAGE_SIZE: 3
-      devstack_local_conf:
-        post-config:
-          $OCTAVIA_CONF:
-            haproxy_amphora:
-              # Set these higher for non-nested virt nodepool instances
-              connection_max_retries: 480
 
 - job:
     name: octavia-v2-dsvm-scenario-ubuntu-bionic
@@ -584,11 +583,6 @@
         OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
         OCTAVIA_AMP_IMAGE_SIZE: 3
       devstack_local_conf:
-        post-config:
-          $OCTAVIA_CONF:
-            haproxy_amphora:
-              # Set these higher for non-nested virt nodepool instances
-              connection_max_retries: 480
         test-config:
           "$TEMPEST_CONFIG":
             load_balancer: