diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-02-24 11:05:18 -0800 |
|---|---|---|
| committer | Ken Pepple <ken.pepple@gmail.com> | 2011-02-24 11:05:18 -0800 |
| commit | 0b490e1ade9e8e65e8df6f86bbe47bd3dbe1d44c (patch) | |
| tree | 73c2638d13d1d2d99447603a2c055dce1ac48a2e /nova/virt | |
| parent | 3696b1d8076426b2d94a232f8b77985d99a3e658 (diff) | |
| parent | 25f50fba4a79b45edea33aab58c76197c7d764dc (diff) | |
merge trunk
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/fake.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 92749f38a..4346dffc1 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -319,7 +319,9 @@ class FakeConnection(object): return 'FAKE CONSOLE OUTPUT' def get_ajax_console(self, instance): - return 'http://fakeajaxconsole.com/?token=FAKETOKEN' + return {'token': 'FAKETOKEN', + 'host': 'fakeajaxconsole.com', + 'port': 6969} def get_console_pool_info(self, console_type): return {'address': '127.0.0.1', |