diff options
| author | Thom Leggett <thom@tteggel.org> | 2015-01-25 11:17:46 +0000 |
|---|---|---|
| committer | Devananda van der Veen <devananda.vdv@gmail.com> | 2015-01-26 11:22:09 +0000 |
| commit | 95d744787fa0ba646594a1163937acb17689e5e2 (patch) | |
| tree | 46838cf6aab9099db01a6b017bc96ac5b42fb35b | |
| parent | 340e30f347dbd86469f300370500ebb0d19399f8 (diff) | |
| download | ironic-95d744787fa0ba646594a1163937acb17689e5e2.tar.gz | |
Update service.py to support graceful Service shutdown
This change backports the latest version of service.py from oslo-incubator.
The latest version supports graceful shutdown for the Service class, which is
needed to enable graceful shutdown for the Ironic Conductor.
Change-Id: Ide6b549aa64333b7781f3525c6d2ccb8762402bf
Partial-Bug: #1382698
(cherry picked from commit dd542195750a19b16a6b1a7cf89d45c70ef2ae61)
| -rw-r--r-- | ironic/openstack/common/service.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/openstack/common/service.py b/ironic/openstack/common/service.py index 89fd7bf5d..88a42ac58 100644 --- a/ironic/openstack/common/service.py +++ b/ironic/openstack/common/service.py @@ -442,8 +442,8 @@ class Service(object): def start(self): pass - def stop(self): - self.tg.stop() + def stop(self, graceful=False): + self.tg.stop(graceful) self.tg.wait() # Signal that service cleanup is done: if not self._done.ready(): |