openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge pull request #75 from galstrom21/master 

Adding templated variables to /etc/nova/nova.conf
This commit is contained in:
Ron Pedde 2012-06-14 08:16:25 -07:00
parent 943b27949c b6613c2438
commit 040ccc35f2
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/default.rb
View File

@ -45,6 +45,7 @@ default["nova"]["services"]["volume"]["path"] = "/v1/%(tenant_id)s"
# can this be wedged into the "api" endpoint?
default["nova"]["compute"]["region"] = "RegionOne"
# TODO(shep): This should probably be ['nova']['network']['fixed']
default["nova"]["networks"] = [
{
"label" => "public",
@ -70,7 +71,9 @@ default["nova"]["networks"] = [
default["nova"]["network"]["fixed_range"] = default["nova"]["networks"][0]["ipv4_cidr"]
default["nova"]["network"]["dmz_cidr"] = "10.128.0.0/24"
default["nova"]["network"]["network_manager"] = "nova.network.manager.FlatDHCPManager"
default["nova"]["scheduler"]["scheduler_driver"] = "nova.scheduler.simple.SimpleScheduler"
default["nova"]["libvirt"]["virt_type"] = "kvm"
default["nova"]["libvirt"]["vncserver_listen"] = node["ipaddress"]
default["nova"]["libvirt"]["vncserver_proxyclient_address"] = node["ipaddress"]

2
recipes/nova-common.rb
View File

@ -72,6 +72,8 @@ template "/etc/nova/nova.conf" do
"glance_api_ipaddress" => glance_endpoint["host"],
"glance_api_port" => glance_endpoint["port"],
"iscsi_helper" => platform_options["iscsi_helper"],
"network_manager" => node["nova"]["network"]["network_manager"],
"scheduler_driver" => node["nova"]["scheduler"]["scheduler_driver"],
"availability_zone" => node["nova"]["config"]["availability_zone"],
"virt_type" => node["nova"]["libvirt"]["virt_type"],
"fixed_range" => node["nova"]["network"]["fixed_range"],

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

@ -16,13 +16,13 @@ rabbit_port=5672
rabbit_host=<%= @rabbit_ipaddress %>
# SCHEDULER
#--scheduler_manager=nova.scheduler.abstract_scheduler.AbstractScheduler
scheduler_driver=nova.scheduler.simple.SimpleScheduler
# scheduler_manager=nova.scheduler.manager.SchedulerManager
scheduler_driver=<%= @scheduler_driver %>
node_availability_zone=<%= @availability_zone %>
default_schedule_zone=nova
# NETWORK
network_manager=nova.network.manager.FlatDHCPManager
network_manager=<%= @network_manager %>
#--flat_interface=eth1
#--flat_network_dhcp_start=10.20.1.2
#--public_interface=eth0