diff --git a/attributes/default.rb b/attributes/default.rb index 21ff501f..fd4a58ed 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -68,6 +68,9 @@ default["nova"]["networks"] = [ } ] +default["nova"]["network"]["fixed_range"] = "192.168.100.0/24" +default["nova"]["network"]["dmz_cidr"] = "10.128.0.0/24" + default["nova"]["libvirt"]["virt_type"] = "kvm" default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"] default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"] diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index a46561e3..6b76e3e4 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -73,7 +73,9 @@ template "/etc/nova/nova.conf" do "glance_api_port" => glance_endpoint["port"], "iscsi_helper" => platform_options["iscsi_helper"], "availability_zone" => node["nova"]["config"]["availability_zone"], - "virt_type" => node["nova"]["libvirt"]["virt_type"] + "virt_type" => node["nova"]["libvirt"]["virt_type"], + "fixed_range" => node["nova"]["network"]["fixed_range"], + "dmz_cidr" => node["nova"]["network"]["dmz_cidr"] ) end diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb index 448d3139..bf1301d1 100644 --- a/templates/default/nova.conf.erb +++ b/templates/default/nova.conf.erb @@ -24,9 +24,10 @@ default_schedule_zone=nova # NETWORK network_manager=nova.network.manager.FlatDHCPManager #--flat_interface=eth1 -#--fixed_range=10.20.1.0/24 #--flat_network_dhcp_start=10.20.1.2 #--public_interface=eth0 +fixed_range=<%= @fixed_range %> +dmz_cidr=<%= @dmz_cidr %> force_dhcp_release=true send_arp_for_ha=True <% if @virt_type == "qemu" -%>