summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2010-07-24 02:49:20 +0100
committerEwan Mellor <ewan.mellor@citrix.com>2010-07-24 02:49:20 +0100
commiteffbd4b4c7077043c0ff2ddcb91607b4e79796f6 (patch)
treea9a4c628533c64211b349c9c3d713ddd9b113c8f /nova/flags.py
parent1046fd21fad35fdb9922f667017937ec94774498 (diff)
parent809a1fe80b9922a36c64bce948588a5797cae87b (diff)
downloadnova-effbd4b4c7077043c0ff2ddcb91607b4e79796f6.tar.gz
nova-effbd4b4c7077043c0ff2ddcb91607b4e79796f6.tar.xz
nova-effbd4b4c7077043c0ff2ddcb91607b4e79796f6.zip
Merged with trunk, since a lot of useful things have gone in there recently.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index caf2d2e93..dc8fc9d10 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -38,7 +38,6 @@ DEFINE_bool = DEFINE_bool
DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake')
DEFINE_integer('s3_port', 3333, 's3 port')
-DEFINE_integer('s3_internal_port', 3334, 's3 port')
DEFINE_string('s3_host', '127.0.0.1', 's3 host')
#DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on')