Merge "Set the default retries down to 120"

etc/octavia.conf

@@ -177,10 +177,10 @@
 # Absolute path to a custom HAProxy template file
 # haproxy_template =
 # connection_logging = True
-# connection_max_retries = 300
+# connection_max_retries = 120
 # connection_retry_interval = 5
 # build_rate_limit = -1
-# build_active_retries = 300
+# build_active_retries = 120
 # build_retry_interval = 5
 
 # Maximum number of entries that can fit in the stick table.

octavia/common/config.py

@@ -238,7 +238,7 @@ haproxy_amphora_opts = [
     cfg.BoolOpt('connection_logging', default=True,
                 help=_('Set this to False to disable connection logging.')),
     cfg.IntOpt('connection_max_retries',
-               default=300,
+               default=120,
                help=_('Retry threshold for connecting to amphorae.')),
     cfg.IntOpt('connection_retry_interval',
                default=5,
@@ -256,7 +256,7 @@ haproxy_amphora_opts = [
                help=_('Number of amphorae that could be built per controller '
                       'worker, simultaneously.')),
     cfg.IntOpt('build_active_retries',
-               default=300,
+               default=120,
                help=_('Retry threshold for waiting for a build slot for '
                       'an amphorae.')),
     cfg.IntOpt('build_retry_interval',

releasenotes/notes/Set-retry-defaults-to-prod-values-f3cc10d16baa716a.yaml

@@ -0,0 +1,25 @@
+---
+upgrade:
+  - |
+    We have changed the [haproxy_amphora] connection_max_retries and
+    build_active_retries default values from 300 to 120. This means load
+    balancer builds will wait for ten minutes instead of twenty-five minutes
+    for nova to boot the virtual machine.
+    We feel these are more reasonable default values for most production
+    deployments and provide a better user experience.
+    If you are running nova in a nested virtualization environment, meaning
+    nova is booting VMs inside another VM, and you do not have nested
+    virtualization enabled in the bottom hypervisor, you may need to set these
+    values back up to 300.
+other:
+  - |
+    We have changed the [haproxy_amphora] connection_max_retries and
+    build_active_retries default values from 300 to 120. This means load
+    balancer builds will wait for ten minutes instead of twenty-five minutes
+    for nova to boot the virtual machine.
+    We feel these are more reasonable default values for most production
+    deployments and provide a better user experience.
+    If you are running nova in a nested virtualization environment, meaning
+    nova is booting VMs inside another VM, and you do not have nested
+    virtualization enabled in the bottom hypervisor, you may need to set these
+    values back up to 300.