Merge "Remove unused flags.Help*Flag"

2 files changed, 0 insertions, 22 deletions

diff --git a/nova/flags.py b/nova/flags.py
index d535f783f..59c44470a 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -226,22 +226,6 @@ def DECLARE(name, module_string, flag_values=FLAGS):
         raise UnrecognizedFlag('%s not defined by %s' % (name, module_string))
 
 
-def DEFINE_flag(flag):
-    pass
-
-
-class HelpFlag:
-    pass
-
-
-class HelpshortFlag:
-    pass
-
-
-class HelpXMLFlag:
-    pass
-
-
 def _get_my_ip():
     """Returns the actual ip of the local machine."""
     try:
diff --git a/nova/service.py b/nova/service.py
index 6ca613b0a..3b930c91c 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -384,12 +384,6 @@ def serve(*servers):
 
 
 def wait():
-    # After we've loaded up all our dynamic bits, check
-    # whether we should print help
-    flags.DEFINE_flag(flags.HelpFlag())
-    flags.DEFINE_flag(flags.HelpshortFlag())
-    flags.DEFINE_flag(flags.HelpXMLFlag())
-    FLAGS.ParseNewFlags()
     logging.debug(_('Full set of FLAGS:'))
     for flag in FLAGS:
         flag_get = FLAGS.get(flag, None)