Remove s3_internal_port setting.

Code Issues Proposed changes

Objectstore should be able to handle the beatings now.
As such, nginx is no longer needed, so it's removed from the dependencies and the configuration files are removed.

This commit is contained in:

Soren Hansen

2010年07月17日 23:04:46 -07:00

parent 9e023095e3

commit 2d5124c3f2

6 changed files with 2 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-objectstore

View File

@@ -35,7 +35,7 @@ FLAGS = flags.FLAGS

def main():

# FIXME: if this log statement isn't here, no logging

# appears from other files and app won't start daemonized

logging.debug('Started HTTP server on %s' % (FLAGS.s3_internal_port))

logging.debug('Started HTTP server on %s' % (FLAGS.s3_port))

app = handler.get_application()

print app

return app

2
debian/control vendored

View File

@@ -91,7 +91,7 @@ Description: Nova Cloud Computing - API frontend

Package: nova-objectstore

Architecture: all

Depends: nova-common (= ${binary:Version}), nginx, ${python:Depends}, ${misc:Depends}

Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}

Description: Nova Cloud Computing - object store

Nova is a cloud computing fabric controller (the main part of an IaaS

system) built to match the popular AWS EC2 and S3 APIs. It is written in

1
debian/nova-objectstore.install vendored

View File

@@ -1,3 +1,2 @@

bin/nova-objectstore usr/bin

debian/nova-objectstore.conf etc/nova

debian/nova-objectstore.nginx.conf etc/nginx/sites-available

1
debian/nova-objectstore.links vendored

View File

@@ -1 +0,0 @@

/etc/nginx/sites-available/nova-objectstore.nginx.conf /etc/nginx/sites-enabled/nova-objectstore.nginx.conf

17
debian/nova-objectstore.nginx.conf vendored

View File

@@ -1,17 +0,0 @@

server {

listen 3333 default;

server_name localhost;

client_max_body_size 10m;

access_log /var/log/nginx/localhost.access.log;

location ~ /_images/.+ {

root /var/lib/nova/images;

rewrite ^/_images/(.*)$ /1ドル break;

}

location / {

proxy_pass http://localhost:3334/;

}

1
nova/flags.py

View File

@@ -37,7 +37,6 @@ DEFINE_bool = DEFINE_bool

# http://code.google.com/p/python-gflags/source/browse/trunk/gflags.py#39

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')