openstack/cookbook-openstack-compute
Code Issues Proposed changes

iscsi_helper config

Browse Source
This commit is contained in:
rpedde
2012-06-01 16:15:19 -05:00
parent 5d7dd9f342
commit 4f4bffa50c
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@@ -110,6 +110,7 @@ when "fedora"
"libvirt_packages" => ["libvirt"], "libvirt_packages" => ["libvirt"],
"libvirt_service" => "libvirtd", "libvirt_service" => "libvirtd",
"common_packages" => ["openstack-nova"], "common_packages" => ["openstack-nova"],
"iscsi_helper" => "ietadm",
"package_overrides" => "" "package_overrides" => ""
} }
when "ubuntu" when "ubuntu"
@@ -137,6 +138,7 @@ when "ubuntu"
"libvirt_packages" => ["libvirt-bin"], "libvirt_packages" => ["libvirt-bin"],
"libvirt_service" => "libvirt-bin", "libvirt_service" => "libvirt-bin",
"common_packages" => ["nova-common"], "common_packages" => ["nova-common"],
"iscsi_helper" => "tgtadm",
"package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'" "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
} }
end end

1
recipes/nova-common.rb
View File

@@ -69,6 +69,7 @@ template "/etc/nova/nova.conf" do
"keystone_service_port" => ks_service_endpoint["port"], "keystone_service_port" => ks_service_endpoint["port"],
"glance_api_ipaddress" => glance_endpoint["host"], "glance_api_ipaddress" => glance_endpoint["host"],
"glance_api_port" => glance_endpoint["port"], "glance_api_port" => glance_endpoint["port"],
"iscsi_helper" => platform_options["iscsi_helper"],
"virt_type" => node["nova"]["libvirt"]["virt_type"] "virt_type" => node["nova"]["libvirt"]["virt_type"]
) )
end end

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

@@ -66,3 +66,6 @@ ec2_private_dns_show_ip=True
# KEYSTONE # KEYSTONE
keystone_ec2_url=http://<%= @keystone_api_ipaddress %>:<%= @keystone_service_port %>/v2.0/ec2tokens keystone_ec2_url=http://<%= @keystone_api_ipaddress %>:<%= @keystone_service_port %>/v2.0/ec2tokens
# Volumes
iscsi_helper=<%= @iscsi_helper %>