openstack/cookbook-openstack-compute
Code Issues Proposed changes

Add network flags

Browse Source
This commit is contained in:
Evan Callicoat
2012-06-03 22:06:03 -05:00
parent 19c3ee38cd
commit 2c9b313d79
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/default.rb
View File

@@ -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"]["virt_type"] = "kvm"
default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"] default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"]
default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"] default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"]

4
recipes/nova-common.rb
View File

@@ -73,7 +73,9 @@ template "/etc/nova/nova.conf" do
"glance_api_port" => glance_endpoint["port"], "glance_api_port" => glance_endpoint["port"],
"iscsi_helper" => platform_options["iscsi_helper"], "iscsi_helper" => platform_options["iscsi_helper"],
"availability_zone" => node["nova"]["config"]["availability_zone"], "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 end

3
templates/default/nova.conf.erb
View File

@@ -24,9 +24,10 @@ default_schedule_zone=nova
# NETWORK # NETWORK
network_manager=nova.network.manager.FlatDHCPManager network_manager=nova.network.manager.FlatDHCPManager
#--flat_interface=eth1 #--flat_interface=eth1
#--fixed_range=10.20.1.0/24
#--flat_network_dhcp_start=10.20.1.2 #--flat_network_dhcp_start=10.20.1.2
#--public_interface=eth0 #--public_interface=eth0
fixed_range=<%= @fixed_range %>
dmz_cidr=<%= @dmz_cidr %>
force_dhcp_release=true force_dhcp_release=true
send_arp_for_ha=True send_arp_for_ha=True
<% if @virt_type == "qemu" -%> <% if @virt_type == "qemu" -%>