openstack/cookbook-openstack-compute
Code Issues Proposed changes

add suse as supported and fix users and package names

Browse Source 
Change-Id: I2cc7e96f2fd8e252bccb83505ccd701698d203fb
This commit is contained in:
Ionuț Arțăriși
2013-02-27 18:28:56 +01:00
parent a1acd590a0
commit bc3adb98a5
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
attributes/default.rb
View File

@@ -37,8 +37,14 @@ default["openstack-compute"]["service_role"] = "admin"
# that is in the paste INI files. # that is in the paste INI files.
default["openstack-compute"]["pki"]["signing_dir"] = "/tmp/nova-signing-dir" default["openstack-compute"]["pki"]["signing_dir"] = "/tmp/nova-signing-dir"
default["openstack-compute"]["user"] = "nova" case platform
default["openstack-compute"]["group"] = "nova" when "fedora", "redhat", "centos", "ubuntu"
default["openstack-compute"]["user"] = "nova"
default["openstack-compute"]["group"] = "nova"
when "suse"
default["openstack-compute"]["user"] = "openstack-nova"
default["openstack-compute"]["group"] = "openstack-nova"
end
# Logging stuff # Logging stuff
default["openstack-compute"]["syslog"]["use"] = false default["openstack-compute"]["syslog"]["use"] = false
@@ -179,7 +185,7 @@ default["openstack-compute"]["api"]["auth"]["cache_dir"] = "/var/cache/nova/api"
default["openstack-compute"]["ceilometer-api"]["auth"]["cache_dir"] = "/var/cache/nova/ceilometer-api" default["openstack-compute"]["ceilometer-api"]["auth"]["cache_dir"] = "/var/cache/nova/ceilometer-api"
case platform case platform
when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this when "fedora", "redhat", "centos", "suse" # :pragma-foodcritic: ~FC024 - won't fix this
default["openstack-compute"]["platform"] = { default["openstack-compute"]["platform"] = {
"api_ec2_packages" => ["openstack-nova-api"], "api_ec2_packages" => ["openstack-nova-api"],
"api_ec2_service" => "openstack-nova-api", "api_ec2_service" => "openstack-nova-api",
@@ -210,6 +216,10 @@ when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
"iscsi_helper" => "ietadm", "iscsi_helper" => "ietadm",
"package_overrides" => "" "package_overrides" => ""
} }
if platform == "suse"
default["openstack-compute"]["platform"]["common_packages"] = ["openstack-nova"]
end
when "ubuntu" when "ubuntu"
default["openstack-compute"]["platform"] = { default["openstack-compute"]["platform"] = {
"api_ec2_packages" => ["nova-api-ec2"], "api_ec2_packages" => ["nova-api-ec2"],

2
metadata.rb
View File

@@ -20,7 +20,7 @@ recipe "openstack-compute::nova-setup", "Sets up the nova database on the mysql
recipe "openstack-compute::scheduler", "Installs nova scheduler service" recipe "openstack-compute::scheduler", "Installs nova scheduler service"
recipe "openstack-compute::vncproxy", "Installs and configures the vncproxy service for console access to VMs" recipe "openstack-compute::vncproxy", "Installs and configures the vncproxy service for console access to VMs"
%w{ ubuntu fedora redhat centos }.each do |os| %w{ ubuntu fedora redhat centos suse }.each do |os|
supports os supports os
end end

1
recipes/libvirt.rb
View File

@@ -76,6 +76,7 @@ template "/etc/libvirt/libvirtd.conf" do
) )
notifies :restart, "service[libvirt-bin]", :immediately notifies :restart, "service[libvirt-bin]", :immediately
not_if { platform? "suse" }
end end
template "/etc/default/libvirt-bin" do template "/etc/default/libvirt-bin" do