diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-12 12:50:17 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-12 12:50:17 -0600 |
| commit | 0c4e8879ea14f79e906ae853032f67f027d58e04 (patch) | |
| tree | 850ea1540d13125b7c7a72b97ad0ff155f6ff71b /nova | |
| parent | 47bc72e5ec27bec349dcfc9468af6325f0a51019 (diff) | |
| parent | 0a0f966fc7e31099574a3fc8eeaf30ac7fc151ad (diff) | |
| download | nova-0c4e8879ea14f79e906ae853032f67f027d58e04.tar.gz nova-0c4e8879ea14f79e906ae853032f67f027d58e04.tar.xz nova-0c4e8879ea14f79e906ae853032f67f027d58e04.zip | |
Merged trunk
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/auth/manager.py | 2 | ||||
| -rw-r--r-- | nova/flags.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 89f02998d..6fb9b522f 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -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, diff --git a/nova/flags.py b/nova/flags.py index fdcba6c72..ef66c3f3a 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -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') |