Merge "Increase Amp Active timeout for tests"

defaults/main.yml

@@ -132,6 +132,9 @@ octavia_service_in_ldap: false
 octavia_rpc_thread_pool_size: 64
 octavia_rpc_conn_pool_size: 30
 
+## Timeouts
+octavia_amp_active_retries: 10
+
 ## Plugin dirs
 octavia_plugin_dirs:
   - /usr/lib/octavia

templates/octavia.conf.j2

@@ -174,7 +174,7 @@ server_ca = /etc/octavia/certs/server_ca.pem
 # rest_request_read_timeout = 60
 
 [controller_worker]
-# amp_active_retries = 10
+amp_active_retries = {{ octavia_amp_active_retries }}
 # amp_active_wait_sec = 10
 # Glance parameters to extract image ID to use for amphora. Only one of
 # parameters is needed. Using tags is the recommended way to refer to images.

tests/os_octavia-overrides.yml

@@ -16,6 +16,8 @@ octavia_v2: True
 octavia_v1: False
 octavia_legacy_policy: True
 
+octavia_amp_active_retries: 20
+
 # Infra hosts don't have enough disk for the 20 GB
 # introduced by Change # I94f5af2055d1b6b41a9a170ca9b4daf57363c972
 octavia_amp_disk: 3