diff options
| -rw-r--r-- | heat/engine/resources/openstack/octavia/health_monitor.py | 4 | ||||
| -rw-r--r-- | heat_integrationtests/functional/test_cancel_update.py | 4 |
2 files changed, 6 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, diff --git a/heat_integrationtests/functional/test_cancel_update.py b/heat_integrationtests/functional/test_cancel_update.py index bfeeda643..68ba3f447 100644 --- a/heat_integrationtests/functional/test_cancel_update.py +++ b/heat_integrationtests/functional/test_cancel_update.py @@ -58,4 +58,8 @@ resources: parameters=parameters, expected_status='UPDATE_IN_PROGRESS') + # Ensure we start updating the server before rolling back + self._wait_for_resource_status( + stack_identifier, 'Server', 'CREATE_IN_PROGRESS') + self.cancel_update_stack(stack_identifier) |