diff --git a/nova/conf/api.py b/nova/conf/api.py
index caedb5724521..2be707e6dc89 100644
--- a/nova/conf/api.py
+++ b/nova/conf/api.py
@@ -427,15 +427,7 @@ ALL_OPTS = (auth_opts +
 
 
 def register_opts(conf):
-    conf.register_opts(auth_opts)
-    conf.register_opts(metadata_opts)
-    conf.register_opt(file_opt)
-    conf.register_opts(osapi_opts)
-    conf.register_opt(allow_instance_snapshots_opt)
-    conf.register_opt(osapi_hide_opt)
-    conf.register_opt(fping_path_opt)
-    conf.register_opts(os_network_opts)
-    conf.register_opt(enable_inst_pw_opt)
+    conf.register_opts(ALL_OPTS)
 
 
 def list_opts():
diff --git a/nova/conf/availability_zone.py b/nova/conf/availability_zone.py
index 3cbaaa7164cf..c3f61639c2eb 100644
--- a/nova/conf/availability_zone.py
+++ b/nova/conf/availability_zone.py
@@ -16,23 +16,19 @@
 
 from oslo_config import cfg
 
-internal_service_availability_zone = cfg.StrOpt(
-     'internal_service_availability_zone',
-      default='internal',
-      help='The availability_zone to show internal services under')
-
-default_availability_zone = cfg.StrOpt(
-     'default_availability_zone',
-      default='nova',
-      help='Default compute node availability_zone')
-
-ALL_OPTS = [internal_service_availability_zone,
-            default_availability_zone]
+availability_zone_opts = [
+    cfg.StrOpt('internal_service_availability_zone',
+        default='internal',
+        help='The availability_zone to show internal services under'),
+    cfg.StrOpt('default_availability_zone',
+        default='nova',
+        help='Default compute node availability_zone'),
+]
 
 
 def register_opts(conf):
-    conf.register_opts(ALL_OPTS)
+    conf.register_opts(availability_zone_opts)
 
 
 def list_opts():
-    return {'DEFAULT': ALL_OPTS}
+    return {'DEFAULT': availability_zone_opts}