From 9c6bf7cf462346ed9379ff217774e2787e64f5f5 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 6 Feb 2012 11:25:40 -0800 Subject: Support fixed_ip range that is a subnet of the network block This enables flat deployments where the instances live on the 'general' network. For example, a typical home router uses 192.168.0.0/16 for the private network. Cloud machines can be assigned 192.168.100.0/24. An example network create command: nova-manage network create private 192.168.0.0/16 1 65536 \ --fixed_cidr=192.168.100.0/24 --gateway=192.168.1.1 Change-Id: I17edd81e9bc21ca3320233b606c99e03e25201bc --- bin/nova-manage | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 27541965fc..35f6f197f7 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -770,6 +770,8 @@ class NetworkCommands(object): @args('--dns2', dest="dns2", metavar="", help='Second DNS') @args('--uuid', dest="uuid", metavar="", help='Network UUID') + @args('--fixed_cidr', dest="fixed_cidr", metavar='', + help='IPv4 subnet for fixed IPS (ex: 10.20.0.0/16)') @args('--project_id', dest="project_id", metavar="", help='Project id') @args('--priority', dest="priority", metavar="", @@ -779,7 +781,7 @@ class NetworkCommands(object): vpn_start=None, fixed_range_v6=None, gateway=None, gateway_v6=None, bridge=None, bridge_interface=None, dns1=None, dns2=None, project_id=None, priority=None, - uuid=None): + uuid=None, fixed_cidr=None): """Creates fixed ips for host by range""" # check for certain required inputs @@ -831,6 +833,9 @@ class NetworkCommands(object): if not network_size: network_size = FLAGS.network_size + if fixed_cidr: + fixed_cidr = netaddr.IPNetwork(fixed_cidr) + # create the network net_manager = utils.import_object(FLAGS.network_manager) net_manager.create_networks(context.get_admin_context(), @@ -850,7 +855,8 @@ class NetworkCommands(object): dns2=dns2, project_id=project_id, priority=priority, - uuid=uuid) + uuid=uuid, + fixed_cidr=fixed_cidr) def list(self): """List all created networks""" -- cgit v1.2.1