Remove old flagfile support.

Implements blueprint remove-old-flagfile

nova-manage can still be used to convert old flagfiles style files
to new .ini files:

$ ./bin/nova-manage  config  convert --help
Usage: nova-manage config convert <args> [options]

Options:
  -h, --help        show this help message and exit
  --infile=<path>   old-style flagfile to convert to config
  --outfile=<path>  path for output file. Writes configto stdout if not
                    specified.

Change-Id: Ib8fbbd858b1db7faef70d7d97955e5042bf378f2
Signed-off-by: Ghe Rivero <ghe@debian.org>

19 files changed, 22 insertions, 22 deletions

diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues
index 29298f18f..37394add6 100755
--- a/bin/clear_rabbit_queues
+++ b/bin/clear_rabbit_queues
@@ -71,7 +71,7 @@ def delete_queues(queues):
         x.queue_delete(q)
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     args = flags.FLAGS(sys.argv)
     logging.setup()
     rpc.register_opts(flags.FLAGS)
diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 5b30c3586..76a33a36f 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -65,7 +65,7 @@ FLAGS = flags.FLAGS
 if __name__ == '__main__':
     rpc.register_opts(FLAGS)
     admin_context = context.get_admin_context()
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     begin, end = utils.last_completed_audit_period()
diff --git a/bin/nova-all b/bin/nova-all
index 143ab2bed..529d98ed0 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -51,7 +51,7 @@ from nova.vnc import xvp_proxy
 LOG = logging.getLogger('nova.all')
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-api b/bin/nova-api
index d8635978e..7a601c3a6 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -42,7 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2
index 9f82a69e4..e1a1549c7 100755
--- a/bin/nova-api-ec2
+++ b/bin/nova-api-ec2
@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-api-metadata b/bin/nova-api-metadata
index 199c3918c..c4ca541f4 100755
--- a/bin/nova-api-metadata
+++ b/bin/nova-api-metadata
@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-api-os-compute b/bin/nova-api-os-compute
index 7bfff2a42..9c49815fe 100755
--- a/bin/nova-api-os-compute
+++ b/bin/nova-api-os-compute
@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-api-os-volume b/bin/nova-api-os-volume
index 33909c5b5..21d5dc3de 100755
--- a/bin/nova-api-os-volume
+++ b/bin/nova-api-os-volume
@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-cert b/bin/nova-cert
index 725bf4aee..f6a5cbbd8 100755
--- a/bin/nova-cert
+++ b/bin/nova-cert
@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-compute b/bin/nova-compute
index 0c69a8129..8f7e9177d 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-console b/bin/nova-console
index 22f6ef171..06e352f48 100755
--- a/bin/nova-console
+++ b/bin/nova-console
@@ -39,7 +39,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     server = service.Service.create(binary='nova-console')
diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth
index fbc9ad849..9c566cb7c 100755
--- a/bin/nova-consoleauth
+++ b/bin/nova-consoleauth
@@ -39,7 +39,7 @@ from nova import utils
 
 
 if __name__ == "__main__":
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
 
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 2f1ef6cec..fab334bf5 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -96,7 +96,7 @@ def init_leases(network_id):
 def main():
     """Parse environment and arguments and call the approproate action."""
     flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
-    utils.default_flagfile(flagfile)
+    utils.default_cfgfile(flagfile)
     argv = FLAGS(sys.argv)
     logging.setup()
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 7b33fa4d3..e076e066e 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1666,11 +1666,11 @@ def methods_of(obj):
 
 def main():
     """Parse options and call the appropriate class/method."""
-    flagfile = utils.default_flagfile()
+    cfgfile = utils.default_cfgfile()
 
-    if flagfile and not os.access(flagfile, os.R_OK):
-        st = os.stat(flagfile)
-        print "Could not read %s. Re-running with sudo" % flagfile
+    if cfgfile and not os.access(cfgfile, os.R_OK):
+        st = os.stat(cfgfile)
+        print "Could not read %s. Re-running with sudo" % cfgfile
         try:
             os.execvp('sudo', ['sudo', '-u', '#%s' % st.st_uid] + sys.argv)
         except Exception:
diff --git a/bin/nova-network b/bin/nova-network
index 0f1482515..d176eb27c 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 70553ea08..e52160c25 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -42,7 +42,7 @@ from nova import utils
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index c1033a304..52db4de7e 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -42,7 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-volume b/bin/nova-volume
index 8caa0f44a..1c6ffb58f 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
index cfd3edc3d..9db07f148 100755
--- a/bin/nova-xvpvncproxy
+++ b/bin/nova-xvpvncproxy
@@ -42,7 +42,7 @@ FLAGS = flags.FLAGS
 
 if __name__ == "__main__":
     rpc.register_opts(FLAGS)
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()