summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/nova-manage10
-rw-r--r--nova/api/openstack/__init__.py2
2 files changed, 1 insertions, 11 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index b62687aec..7835ca551 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -569,15 +569,6 @@ class DbCommands(object):
print migration.db_version()
-class ZoneCommands(object):
- """Methods for defining zones."""
-
- def create(self, name):
- """Create a new Zone for this deployment."""
- ctxt = context.get_admin_context()
- db.create_zone(ctxt, name)
-
-
class VolumeCommands(object):
"""Methods for dealing with a cloud in an odd state"""
@@ -629,7 +620,6 @@ CATEGORIES = [
('service', ServiceCommands),
('log', LogCommands),
('db', DbCommands),
- ('zone', ZoneCommands),
('volume', VolumeCommands)]
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 8901a8987..69a4d66c0 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -80,7 +80,7 @@ class APIRouter(wsgi.Router):
server_members["actions"] = "GET"
server_members['suspend'] = 'POST'
server_members['resume'] = 'POST'
-
+
mapper.resource("zone", "zones", controller=zones.Controller(),
collection={'detail': 'GET'},
collection_name='zones')