summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-09-28 23:30:58 +1200
committerRico Lin <rico.lin.guanyu@gmail.com>2019-09-30 03:34:25 +0000
commite109d6d4968bde151cbcaddf31be8d11ead2f492 (patch)
tree81e90a5ac599aad5d40fd0b93c9484929b383d81
parent05bb44663745d5132f5f0db098bc699cc32be356 (diff)
downloadheat-e109d6d4968bde151cbcaddf31be8d11ead2f492.tar.gz
Fix the wrong time unit for OS::Octavia::HealthMonitor
Unit of both 'delay' and 'timeout' should be seconds based on Octavia API doc https://docs.openstack.org/api-ref/load-balancer/v2/index.html?expanded=create-health-monitor-detail#id105 Change-Id: I6de88e687ff95432ddbd0547a7f5759e18d7749e Story: 2006637 Task: 36852 (cherry picked from commit ad841b4483eeba9dfd0ccd8f8b4c5d5fd3e15cc1)
-rw-r--r--heat/engine/resources/openstack/octavia/health_monitor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/resources/openstack/octavia/health_monitor.py b/heat/engine/resources/openstack/octavia/health_monitor.py
index 87d2edc27..a2af07bb0 100644
--- a/heat/engine/resources/openstack/octavia/health_monitor.py
+++ b/heat/engine/resources/openstack/octavia/health_monitor.py
@@ -56,7 +56,7 @@ class HealthMonitor(octavia_base.OctaviaBase):
),
DELAY: properties.Schema(
properties.Schema.INTEGER,
- _('The minimum time in milliseconds between regular connections '
+ _('The minimum time in seconds between regular connections '
'of the member.'),
required=True,
update_allowed=True,
@@ -95,7 +95,7 @@ class HealthMonitor(octavia_base.OctaviaBase):
),
TIMEOUT: properties.Schema(
properties.Schema.INTEGER,
- _('Maximum number of milliseconds for a monitor to wait for a '
+ _('Maximum number of seconds for a monitor to wait for a '
'connection to be established before it times out.'),
required=True,
update_allowed=True,