summaryrefslogtreecommitdiffstats
path: root/bin/nova-api-ec2
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-05-29 08:57:58 +0100
committerMark McLoughlin <markmc@redhat.com>2012-05-30 21:24:53 +0100
commit00786bc554a2dfacb3c6f02fbb7e9c98f35d4262 (patch)
tree93cc4a0cd0af8a9db30eb5fa02365f0f01207627 /bin/nova-api-ec2
parentd7e613dabc2dbc28d9405a5b450dc2b4dfa9d47b (diff)
downloadnova-00786bc554a2dfacb3c6f02fbb7e9c98f35d4262.tar.gz
nova-00786bc554a2dfacb3c6f02fbb7e9c98f35d4262.tar.xz
nova-00786bc554a2dfacb3c6f02fbb7e9c98f35d4262.zip
Use cfg's new global CONF object
Implements blueprint cfg-global-object Replace nova.flags.FLAGS with openstack.common.cfg.CONF. In future, we can do a s/FLAGS/CONF/ across the codebase. Change-Id: Ib293873089a5399febd7a3b0410f66e9bef115f1
Diffstat (limited to 'bin/nova-api-ec2')
-rwxr-xr-xbin/nova-api-ec23
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2
index e1a1549c7..b53c9158a 100755
--- a/bin/nova-api-ec2
+++ b/bin/nova-api-ec2
@@ -38,8 +38,7 @@ from nova import service
from nova import utils
if __name__ == '__main__':
- utils.default_cfgfile()
- flags.FLAGS(sys.argv)
+ flags.parse_args(sys.argv)
logging.setup()
utils.monkey_patch()
server = service.WSGIService('ec2')