openstack/cookbook-openstack-compute
Code Issues Proposed changes

Merge pull request #113 from rackerjoe/master

Browse Source 
Merged automatically by jenkins after successful build test
This commit is contained in:
rcbjenkins
2012-07-13 06:04:49 -07:00
parent 95c5de2b64 f462d4ccab
commit b5c5a2ddee
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
attributes/default.rb
View File

@@ -4,7 +4,7 @@ default["enable_monit"] = false # OS provides packages
default["developer_mode"] = false # we want secure passwords by default
########################################################################
default["patch_files_on_disk"] = false
default["nova"]["apply_patches"] = true
default["nova"]["db"]["name"] = "nova"
default["nova"]["db"]["username"] = "nova"
@@ -79,10 +79,7 @@ default["nova"]["network"]["fixed_range"] = default["nova"]["networks"][0]["ipv4
default["nova"]["network"]["dmz_cidr"] = "10.128.0.0/24"
default["nova"]["network"]["network_manager"] = "nova.network.manager.FlatDHCPManager"
# TODO(breu): ...
# WARNING: Do not set the scheduler_driver to nova.scheduler.filter_scheduler.FilterScheduler
# until bug https://bugs.launchpad.net/nova/+bug/1007573 has been resolved and patched in
# the Ubuntu packages
#default["nova"]["scheduler"]["scheduler_driver"] = "nova.scheduler.filter_scheduler.FilterScheduler"
default["nova"]["scheduler"]["scheduler_driver"] = "nova.scheduler.simple.SimpleScheduler"
default["nova"]["scheduler"]["default_filters"] = ["AvailabilityZoneFilter",
"RamFilter",

3
recipes/nova-scheduler-patch.rb
View File

@@ -25,6 +25,5 @@ template "/usr/share/pyshared/nova/scheduler/filters/affinity_filter.py" do
group "root"
mode "0644"
notifies :restart, resources(:service => "nova-scheduler"), :immediately
only_if { node["patch_files_on_disk"] and
::Chef::Recipe::Patch.check_package_version("nova-scheduler","2012.1+stable~20120612-3ee026e-0ubuntu1.2") }
only_if { ::Chef::Recipe::Patch.check_package_version("nova-scheduler","2012.1+stable~20120612-3ee026e-0ubuntu1.2",node) }
end

2
recipes/scheduler.rb
View File

@@ -51,4 +51,4 @@ monitoring_procmon "nova-scheduler" do
stop_cmd "/usr/sbin/service #{service_name} stop"
end
include_recipe "nova::nova-scheduler-patch"
#include_recipe "nova::nova-scheduler-patch"