diff options
| author | John Tran <jtran@attinteractive.com> | 2011-08-04 19:43:33 -0700 |
|---|---|---|
| committer | John Tran <jtran@attinteractive.com> | 2011-08-04 19:43:33 -0700 |
| commit | d4c5d5b18fc3b51fcb1ee5bc39ac866c4aa47d48 (patch) | |
| tree | abb583c2207af3869aebc95e739508f130ffc631 /bin | |
| parent | b557b6366b21a0d3795369785037ee29c8cef377 (diff) | |
| parent | 502801bfff0015ed3aa93b9d65a87cb6b80fd11d (diff) | |
merged trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 10 | ||||
| -rwxr-xr-x | bin/nova-manage | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 21cf68007..2329581a2 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -114,11 +114,11 @@ class AjaxConsoleProxy(object): AjaxConsoleProxy.tokens[kwargs['token']] = \ {'args': kwargs, 'last_activity': time.time()} - conn = rpc.Connection.instance(new=True) - consumer = rpc.TopicAdapterConsumer( - connection=conn, - proxy=TopicProxy, - topic=FLAGS.ajax_console_proxy_topic) + conn = rpc.create_connection(new=True) + consumer = rpc.create_consumer( + conn, + FLAGS.ajax_console_proxy_topic, + TopicProxy) def delete_expired_tokens(): now = time.time() diff --git a/bin/nova-manage b/bin/nova-manage index 807753a2e..f272351c2 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -56,6 +56,7 @@ import gettext import glob import json +import math import netaddr import os import sys @@ -694,7 +695,17 @@ class NetworkCommands(object): if not num_networks: num_networks = FLAGS.num_networks if not network_size: - network_size = FLAGS.network_size + fixnet = netaddr.IPNetwork(fixed_range_v4) + each_subnet_size = fixnet.size / int(num_networks) + if each_subnet_size > FLAGS.network_size: + network_size = FLAGS.network_size + subnet = 32 - int(math.log(network_size, 2)) + oversize_msg = _('Subnet(s) too large, defaulting to /%s.' + ' To override, specify network_size flag.' + ) % subnet + print oversize_msg + else: + network_size = fixnet.size if not multi_host: multi_host = FLAGS.multi_host else: |