Merge "Remove availability_zones from service table"

2013-01-09 04:09:31 +00:00
parent 2a2892f15e 1ab2fc6477
commit ddb2400047
24 changed files with 291 additions and 93 deletions
--- a/nova/config.py
+++ b/nova/config.py
@@ -108,9 +108,6 @@ global_opts = [
                    'However, the node name must be valid within '
                    'an AMQP key, and if using ZeroMQ, a valid '
                    'hostname, FQDN, or IP address'),
-    cfg.StrOpt('node_availability_zone',
-               default='nova',
-               help='availability zone of this node'),
    cfg.ListOpt('memcached_servers',
                default=None,
                help='Memcached servers or None for in process cache.'),