diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-15 21:00:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-15 21:00:09 +0000 |
| commit | 425260920790b1d39668b7bbe00812d61e6fa0e9 (patch) | |
| tree | 8645222afc8dd466bbc42a7987817dd0c9c4eb7d | |
| parent | adac77a47ce1408e661e851e92a657ecfed3b911 (diff) | |
| parent | e109d6d4968bde151cbcaddf31be8d11ead2f492 (diff) | |
| download | heat-425260920790b1d39668b7bbe00812d61e6fa0e9.tar.gz | |
Merge "Fix the wrong time unit for OS::Octavia::HealthMonitor" into stable/stein
| -rw-r--r-- | heat/engine/resources/openstack/octavia/health_monitor.py | 4 |
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, |