add ability to set multi_host in nova-manage and remove debugging issues

3 files changed, 12 insertions, 6 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 71c99138f..cd43f734f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -558,12 +558,12 @@ class NetworkCommands(object):
     """Class for managing networks."""
 
     def create(self, label=None, fixed_range=None, num_networks=None,
-               network_size=None, vlan_start=None,
+               network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
                flat_network_bridge=None, bridge_interface=None):
         """Creates fixed ips for host by range
         arguments: label, fixed_range, [num_networks=FLAG],
-                   [network_size=FLAG], [vlan_start=FLAG],
+                   [network_size=FLAG], [multi_host=FLAG], [vlan_start=FLAG],
                    [vpn_start=FLAG], [fixed_range_v6=FLAG], [gateway_v6=FLAG],
                    [flat_network_bridge=FLAG], [bridge_interface=FLAG]
         If you wish to use a later argument fill in the gaps with 0s
@@ -583,6 +583,10 @@ class NetworkCommands(object):
             num_networks = FLAGS.num_networks
         if not network_size:
             network_size = FLAGS.network_size
+        if not multi_host:
+            multi_host = FLAGS.multi_host
+        else:
+            multi_host = multi_host == 'T'
         if not vlan_start:
             vlan_start = FLAGS.vlan_start
         if not vpn_start:
@@ -601,6 +605,7 @@ class NetworkCommands(object):
             net_manager.create_networks(context.get_admin_context(),
                                         label=label,
                                         cidr=fixed_range,
+                                        multi_host=multi_host,
                                         num_networks=int(num_networks),
                                         network_size=int(network_size),
                                         vlan_start=int(vlan_start),
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9c138d2fd..472513329 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -683,7 +683,6 @@ def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):
         if host:
             fixed_ip_ref.host = host
         session.add(fixed_ip_ref)
-    LOG.warn("gave address %s to %s, %s", fixed_ip_ref['address'], instance_id, host)
     return fixed_ip_ref['address']
 
 
diff --git a/nova/network/manager.py b/nova/network/manager.py
index ce631ce75..d799d5346 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -86,6 +86,8 @@ flags.DEFINE_integer('num_networks', 1, 'Number of networks to support')
 flags.DEFINE_string('vpn_ip', '$my_ip',
                     'Public IP for the cloudpipe VPN servers')
 flags.DEFINE_integer('vpn_start', 1000, 'First Vpn port for private networks')
+flags.DEFINE_bool('multi_host', False,
+                  'Default value for multi_host in networks')
 flags.DEFINE_integer('network_size', 256,
                         'Number of addresses in each private subnet')
 flags.DEFINE_string('floating_range', '4.4.4.0/24',
@@ -360,7 +362,7 @@ class NetworkManager(manager.SchedulerDependentManager):
                 LOG.debug(_('Dissassociated %s stale fixed ip(s)'), num)
 
         # setup any new networks which have been created
-        #self.set_network_hosts(context)
+        self.set_network_hosts(context)
 
     def set_network_host(self, context, network_id):
         """Safely sets the host of the network."""
@@ -585,7 +587,7 @@ class NetworkManager(manager.SchedulerDependentManager):
                 network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
                 self._update_dhcp(context, network_ref)
 
-    def create_networks(self, context, label, cidr, num_networks,
+    def create_networks(self, context, label, cidr, multi_host, num_networks,
                         network_size, cidr_v6, gateway_v6, bridge,
                         bridge_interface, **kwargs):
         """Create networks based on parameters."""
@@ -604,6 +606,7 @@ class NetworkManager(manager.SchedulerDependentManager):
             net['bridge_interface'] = bridge_interface
             net['dns'] = FLAGS.flat_network_dns
             net['cidr'] = cidr
+            net['multi_host'] = multi_host
             net['netmask'] = str(project_net.netmask)
             net['gateway'] = str(project_net[1])
             net['broadcast'] = str(project_net.broadcast)
@@ -641,7 +644,6 @@ class NetworkManager(manager.SchedulerDependentManager):
                 #             robust solution would be to make them uniq per ip
                 net['vpn_public_port'] = kwargs['vpn_start'] + index
 
-            net['multi_host'] = True
             # None if network with cidr or cidr_v6 already exists
             network = self.db.network_create_safe(context, net)