openstack/nova
Code Issues Proposed changes

change novarc template from cc_port to osapi_port. Removed osapi_port from bin scripts.

Browse Source
This commit is contained in:
Sandy Walsh
2011-01-12 14:16:51 -04:00
parent 3d57735caf
commit 3e9d08bded
4 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/nova-api
View File

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

1
bin/nova-combined
View File

@@ -44,7 +44,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')

2
nova/auth/manager.py
View File

@@ -747,7 +747,7 @@ class AuthManager(object):
's3': 'http://%s:%s' % (s3_host, FLAGS.s3_port),
'os': '%s://%s:%s%s' % (FLAGS.os_prefix,
cc_host,
FLAGS.cc_port,
FLAGS.osapi_port,
FLAGS.os_suffix),
'user': user.name,
'nova': FLAGS.ca_file,

1
nova/flags.py
View File

@@ -259,6 +259,7 @@ DEFINE_string('os_prefix', 'http', 'prefix for openstack')
DEFINE_string('cc_host', '$my_ip', 'ip of api server')
DEFINE_string('cc_dmz', '$my_ip', 'internal ip of api server')
DEFINE_integer('cc_port', 8773, 'cloud controller port')
DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
DEFINE_string('ec2_suffix', '/services/Cloud', 'suffix for ec2')
DEFINE_string('os_suffix', '/v1.0/', 'suffix for openstack')