diff --git a/attributes/default.rb b/attributes/default.rb index 92207f3d..d6b6c7e4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -244,6 +244,7 @@ when "fedora", "redhat", "centos", "suse" # :pragma-foodcritic: ~FC024 - won't f "mysql_service" => "mysqld", "common_packages" => ["openstack-nova-common"], "iscsi_helper" => "ietadm", + "nfs_packages" => ["nfs-utils", "nfs-utils-lib"], "package_overrides" => "" } if platform == "suse" @@ -300,6 +301,7 @@ when "ubuntu" "mysql_service" => "mysql", "common_packages" => ["nova-common"], "iscsi_helper" => "tgtadm", + "nfs_packages" => ["nfs-common"], "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'" } end diff --git a/recipes/compute.rb b/recipes/compute.rb index cdd225af..ab563d1b 100644 --- a/recipes/compute.rb +++ b/recipes/compute.rb @@ -49,6 +49,17 @@ compute_compute_packages.each do |pkg| end end +# Installing nfs client packages because in grizzly, cinder nfs is supported +# Never had to install iscsi packages because nova-compute package depends it +# So volume-attach 'just worked' before - alop +platform_options["nfs_packages"].each do |pkg| + package pkg do + options platform_options["package_overrides"] + + action :upgrade + end +end + cookbook_file "/etc/nova/nova-compute.conf" do source "nova-compute.conf" mode 00644 diff --git a/spec/compute-redhat_spec.rb b/spec/compute-redhat_spec.rb index e4df5cca..48b4e91c 100644 --- a/spec/compute-redhat_spec.rb +++ b/spec/compute-redhat_spec.rb @@ -28,6 +28,11 @@ describe "openstack-compute::compute" do expect(@chef_run).to upgrade_package "openstack-nova-compute" end + it "installs nfs client packages" do + expect(@chef_run).to upgrade_package "nfs-utils" + expect(@chef_run).to upgrade_package "nfs-utils-lib" + end + it "starts nova compute on boot" do expected = "openstack-nova-compute" expect(@chef_run).to set_service_to_start_on_boot expected diff --git a/spec/compute_spec.rb b/spec/compute_spec.rb index 7f5157ff..42d14a61 100644 --- a/spec/compute_spec.rb +++ b/spec/compute_spec.rb @@ -31,6 +31,10 @@ describe "openstack-compute::compute" do expect(@chef_run).to upgrade_package "nova-compute" end + it "installs nfs client packages" do + expect(@chef_run).to upgrade_package "nfs-common" + end + it "installs kvm when virt_type is 'kvm'" do chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS node = chef_run.node