diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-12 13:22:30 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-12 13:22:30 -0600 |
| commit | 0240e044b281f0c7af0a23b0ab1b3854a6e6b94a (patch) | |
| tree | 44abd072bf97be75930f4594199c5780b2cfd104 /nova | |
| parent | ea1f5ad611a84931dc4a02b3c4bf2c6ef89f7360 (diff) | |
| parent | 0a0f966fc7e31099574a3fc8eeaf30ac7fc151ad (diff) | |
| download | nova-0240e044b281f0c7af0a23b0ab1b3854a6e6b94a.tar.gz nova-0240e044b281f0c7af0a23b0ab1b3854a6e6b94a.tar.xz nova-0240e044b281f0c7af0a23b0ab1b3854a6e6b94a.zip | |
merged changes from 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') |