diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-29 13:29:45 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-29 13:29:45 +0200 |
| commit | c43fb8325eb068e970df02ec99d02f37de38ecc4 (patch) | |
| tree | b4ecce6394cdb4ceb8fb382cb12045870177bb9b /nova/flags.py | |
| parent | e609dd8620796f4eadefcff6130dfeae06b97ef4 (diff) | |
| parent | 43ce84290964b433fd9d9898772d29bffc385dd8 (diff) | |
| download | nova-c43fb8325eb068e970df02ec99d02f37de38ecc4.tar.gz nova-c43fb8325eb068e970df02ec99d02f37de38ecc4.tar.xz nova-c43fb8325eb068e970df02ec99d02f37de38ecc4.zip | |
Merge trunk.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 6a1c14490..c32cdd7a4 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -188,6 +188,8 @@ DEFINE_string('rabbit_userid', 'guest', 'rabbit userid') DEFINE_string('rabbit_password', 'guest', 'rabbit password') DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') +DEFINE_string('cc_host', '127.0.0.1', 'ip of api server') +DEFINE_integer('cc_port', 8773, 'cloud controller port') DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud', 'Url to ec2 api server') |