diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-26 23:57:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-26 23:57:25 +0000 |
| commit | d751a58d0a909a5ab9605a4fc707c1027d710755 (patch) | |
| tree | 903098c91e8ed17851084c94e8d5142e14c7c326 /nova/api | |
| parent | 0e4e6edb06951dc836651697c2dc6bd0a7d0f862 (diff) | |
| parent | 64e167eb62bd3483b2947ec8de218453c116bd93 (diff) | |
| download | nova-d751a58d0a909a5ab9605a4fc707c1027d710755.tar.gz nova-d751a58d0a909a5ab9605a4fc707c1027d710755.tar.xz nova-d751a58d0a909a5ab9605a4fc707c1027d710755.zip | |
Merge "Add pluggable ServiceGroup monitoring APIs"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index aca4ab3b2..ad922118e 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -41,6 +41,7 @@ from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import quota +from nova import servicegroup from nova import utils from nova import volume @@ -196,6 +197,7 @@ class CloudController(object): volume_api=self.volume_api, security_group_api=self.security_group_api) self.keypair_api = compute_api.KeypairAPI() + self.servicegroup_api = servicegroup.API() def __str__(self): return 'CloudController' @@ -273,7 +275,7 @@ class CloudController(object): 'zoneState': ''}) for service in host_services[host]: - alive = utils.service_is_up(service) + alive = self.servicegroup_api.service_is_up(service) art = (alive and ":-)") or "XXX" active = 'enabled' if service['disabled']: |