From 2fde6c701523b510939b0954520500174e0f41d7 Mon Sep 17 00:00:00 2001 From: wilk Date: Thu, 5 Jul 2012 10:12:20 -0500 Subject: [PATCH 1/2] Added toggle for force_raw_images (default false) --- attributes/default.rb | 2 +- recipes/nova-common.rb | 1 + templates/default/nova.conf.erb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 95201df7..8747f3dc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -88,7 +88,7 @@ default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"] default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"] default["nova"]["libvirt"]["auth_tcp"] = "none" default["nova"]["config"]["availability_zone"] = "nova" - +default["nova"]["config"]["force_raw_images"] = false # FIXME: OMG! default["nova"]["libvirt"]["ssh"]["private_key"] = "-----BEGIN DSA PRIVATE KEY----- MIIBvAIBAAKBgQDUIz3rg0afavOwNeTJL/112U/l4B08kzZVx+QcflxllpW4sn/f diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index b6e50f07..28781d97 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -81,6 +81,7 @@ template "/etc/nova/nova.conf" do "availability_zone" => node["nova"]["config"]["availability_zone"], "virt_type" => node["nova"]["libvirt"]["virt_type"], "fixed_range" => node["nova"]["network"]["fixed_range"], + "force_raw_images" => node["nova"]["config"]["force_raw_images"].to_s, "dmz_cidr" => node["nova"]["network"]["dmz_cidr"] ) end diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb index 47a80624..d8f63a4b 100644 --- a/templates/default/nova.conf.erb +++ b/templates/default/nova.conf.erb @@ -65,6 +65,7 @@ xvpvncproxy_port=<%= @xvpvncproxy_bind_port %> use_deprecated_auth=false allow_admin_api=true enable_zone_routing=true +force_raw_images=<%= @force_raw_images %> <% if node["platform"] == "fedora" -%> # Adding support for non-modded euca2ools to display ip address info From 983b52de48d57a031ddb32ef694604c2d1403257 Mon Sep 17 00:00:00 2001 From: wilk Date: Thu, 5 Jul 2012 13:56:04 -0500 Subject: [PATCH 2/2] default_schedule_zone attribute --- attributes/default.rb | 1 + recipes/nova-common.rb | 1 + templates/default/nova.conf.erb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8747f3dc..3f64053a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -88,6 +88,7 @@ default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"] default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"] default["nova"]["libvirt"]["auth_tcp"] = "none" default["nova"]["config"]["availability_zone"] = "nova" +default["nova"]["config"]["default_schedule_zone"] = "nova" default["nova"]["config"]["force_raw_images"] = false # FIXME: OMG! default["nova"]["libvirt"]["ssh"]["private_key"] = "-----BEGIN DSA PRIVATE KEY----- diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index 28781d97..d4e44ed8 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -79,6 +79,7 @@ template "/etc/nova/nova.conf" do "scheduler_driver" => node["nova"]["scheduler"]["scheduler_driver"], "scheduler_default_filters" => node["nova"]["scheduler"]["default_filters"].join(","), "availability_zone" => node["nova"]["config"]["availability_zone"], + "default_schedule_zone" => node["nova"]["config"]["default_schedule_zone"], "virt_type" => node["nova"]["libvirt"]["virt_type"], "fixed_range" => node["nova"]["network"]["fixed_range"], "force_raw_images" => node["nova"]["config"]["force_raw_images"].to_s, diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb index d8f63a4b..3d7a5f11 100644 --- a/templates/default/nova.conf.erb +++ b/templates/default/nova.conf.erb @@ -24,7 +24,7 @@ rabbit_host=<%= @rabbit_ipaddress %> scheduler_driver=<%= @scheduler_driver %> scheduler_default_filters=<%= @scheduler_default_filters %> node_availability_zone=<%= @availability_zone %> -default_schedule_zone=nova +default_schedule_zone=<%= @default_schedule_zone %> # NETWORK network_manager=<%= @network_manager %>