diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-10 16:10:03 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-10 16:10:03 -0600 |
| commit | cd39a9814c80ad92857ba3200c443d3155993dd9 (patch) | |
| tree | d29db91f77b709e9d509dcd12d02652418948081 /nova/api | |
| parent | bae57e82767b4877bae5c2dcb6fe052291d16b32 (diff) | |
| parent | 9d5ef60e4126f3c5f742d24d4e6a617a7cff20eb (diff) | |
| download | nova-cd39a9814c80ad92857ba3200c443d3155993dd9.tar.gz nova-cd39a9814c80ad92857ba3200c443d3155993dd9.tar.xz nova-cd39a9814c80ad92857ba3200c443d3155993dd9.zip | |
merged trunk changes
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 7f1a414f3..99a9677c4 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -42,6 +42,7 @@ from nova.compute import instance_types FLAGS = flags.FLAGS +flags.DECLARE('service_down_time', 'nova.scheduler.driver') LOG = logging.getLogger("nova.api.cloud") @@ -198,7 +199,7 @@ class CloudController(object): 'zoneState': 'available'}]} services = db.service_get_all(context) - now = db.get_time() + now = datetime.datetime.utcnow() hosts = [] for host in [service['host'] for service in services]: if not host in hosts: |