Add new parameter options to Octavia service

This patch adds three new parameters:

1. OctaviaConnectionMaxRetries
2. OctaviaBuildActiveRetries
3. OctaviaPortDetachTimeout

The default values are same as in octavia and puppet-octavia master
branches as of now.

Depends-On: https://review.opendev.org/#/c/682636/
Change-Id: Id5f7bb2160215170561f39015ddfdb93cba904b5
(cherry picked from commit f924a35d70)
(cherry picked from commit e90b0d898e)
(cherry picked from commit dd3356189b)
This commit is contained in:
Carlos Goncalves 2019-09-17 15:10:47 +02:00
parent 75ded0e323
commit 24f1ac9641
2 changed files with 22 additions and 0 deletions

View File

@ -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

View File

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