diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-09-06 05:00:18 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-09-06 05:00:18 -0700 |
| commit | 9bfdf239df25496e5ff13fbe3cf086f4cd1d4df2 (patch) | |
| tree | 2d94e0c48d2f41d81082fe262c220d54ac807cfe /nova | |
| parent | 75c355b42f6c24723c57228d8acfad64fd4ec7d0 (diff) | |
| download | nova-9bfdf239df25496e5ff13fbe3cf086f4cd1d4df2.tar.gz nova-9bfdf239df25496e5ff13fbe3cf086f4cd1d4df2.tar.xz nova-9bfdf239df25496e5ff13fbe3cf086f4cd1d4df2.zip | |
zone name not overwritten
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/scheduler/zone_manager.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index 9d05ea42e..d3cf57639 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -60,7 +60,6 @@ class ZoneState(object): child zone.""" self.last_seen = utils.utcnow() self.attempt = 0 - self.name = zone_metadata.get("name", "n/a") self.capabilities = ", ".join(["%s=%s" % (k, v) for k, v in zone_metadata.iteritems() if k != 'name']) self.is_active = True @@ -91,7 +90,7 @@ class ZoneState(object): def _call_novaclient(zone): """Call novaclient. Broken out for testing purposes.""" client = novaclient.Client(zone.username, zone.password, None, - zone.api_url) + zone.api_url, service_name = zone.name) return client.zones.info()._info |