diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
| commit | b8c45af21d38e476d8f667089fc03b347d7969e2 (patch) | |
| tree | e79cd390331ca2053e5432b214ddb826eba87bc5 /nova/flags.py | |
| parent | c71d5d41bb6e5d7a046a76563eed75a4d6e77e90 (diff) | |
| parent | 9fb1e7b1f627b10fda1249754e4bc612d697110c (diff) | |
| download | nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.gz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.xz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.zip | |
Merged with trunk revno 565.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 1 |
1 files changed, 1 insertions, 0 deletions
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') |