summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorMORITA Kazutaka <morita.kazutaka@gmail.com>2011-01-13 21:02:14 +0900
committerMORITA Kazutaka <morita.kazutaka@gmail.com>2011-01-13 21:02:14 +0900
commit40e13153d3a8ceef80fa40a59145672df796baa8 (patch)
tree9887fa6698a0cbae2da6211921df62308fbb1f79 /bin/nova-api
parent1c694e9093c627bd50b35e9fb0ae11adf315a154 (diff)
parent621cf8e156582b3ff4dd44409324cc3a5f9aecf4 (diff)
downloadnova-40e13153d3a8ceef80fa40a59145672df796baa8.tar.gz
nova-40e13153d3a8ceef80fa40a59145672df796baa8.tar.xz
nova-40e13153d3a8ceef80fa40a59145672df796baa8.zip
Merge trunk
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 1c671201e..c7cbb3ab4 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -41,7 +41,6 @@ from nova import wsgi
FLAGS = flags.FLAGS
-flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')