Merge "Add new parameter options to Octavia service" into stable/rocky

puppet/services/octavia-controller.yaml

@@ -51,6 +51,19 @@ parameters:
     description: Nova flavor ID to be used when creating the nova flavor for
                  amphora.
     type: string
+    type: number
+  OctaviaConnectionMaxRetries:
+    default: 120
+    description: Retry threshold for connecting to amphorae.
+    type: number
+  OctaviaBuildActiveRetries:
+    default: 120
+    description: Retry threshold for waiting for a build slot for an amphorae.
+    type: number
+  OctaviaPortDetachTimeout:
+    default: 300
+    description: Seconds to wait for a port to detach from an amphora.
+    type: number
 
 conditions:
   octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
@@ -80,6 +93,9 @@ outputs:
             octavia::controller::amp_image_tag: {get_param: OctaviaAmphoraImageTag}
             octavia::controller::amp_ssh_key_name: {get_param: OctaviaAmphoraSshKeyName}
             octavia::controller::enable_ssh_access: true
+            octavia::controller::connection_max_retries: {get_param: OctaviaConnectionMaxRetries}
+            octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
+            octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
           -
             if:
             - octavia_topology_unset

releasenotes/notes/add-three-more-octavia-params-1e4a32f910e5f1fc.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Three new parameter options are now added to Octavia service
+    (OctaviaConnectionMaxRetries, OctaviaBuildActiveRetries,
+    OctaviaPortDetachTimeout)