Added nfs client packages
Since grizzly introduced cinder nfs support, compute nodes will need nfs client packages to mount nfs shares for cinder. Change-Id: Id469c3dc480b81438cef8c23b5344fd5a7dd7f7b
This commit is contained in:
parent
d1d2a02a9c
commit
af3ac2724e
|
@ -244,6 +244,7 @@ when "fedora", "redhat", "centos", "suse" # :pragma-foodcritic: ~FC024 - won't f
|
||||||
"mysql_service" => "mysqld",
|
"mysql_service" => "mysqld",
|
||||||
"common_packages" => ["openstack-nova-common"],
|
"common_packages" => ["openstack-nova-common"],
|
||||||
"iscsi_helper" => "ietadm",
|
"iscsi_helper" => "ietadm",
|
||||||
|
"nfs_packages" => ["nfs-utils", "nfs-utils-lib"],
|
||||||
"package_overrides" => ""
|
"package_overrides" => ""
|
||||||
}
|
}
|
||||||
if platform == "suse"
|
if platform == "suse"
|
||||||
|
@ -300,6 +301,7 @@ when "ubuntu"
|
||||||
"mysql_service" => "mysql",
|
"mysql_service" => "mysql",
|
||||||
"common_packages" => ["nova-common"],
|
"common_packages" => ["nova-common"],
|
||||||
"iscsi_helper" => "tgtadm",
|
"iscsi_helper" => "tgtadm",
|
||||||
|
"nfs_packages" => ["nfs-common"],
|
||||||
"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
|
||||||
|
|
|
@ -49,6 +49,17 @@ compute_compute_packages.each do |pkg|
|
||||||
end
|
end
|
||||||
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
|
cookbook_file "/etc/nova/nova-compute.conf" do
|
||||||
source "nova-compute.conf"
|
source "nova-compute.conf"
|
||||||
mode 00644
|
mode 00644
|
||||||
|
|
|
@ -28,6 +28,11 @@ describe "openstack-compute::compute" do
|
||||||
expect(@chef_run).to upgrade_package "openstack-nova-compute"
|
expect(@chef_run).to upgrade_package "openstack-nova-compute"
|
||||||
end
|
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
|
it "starts nova compute on boot" do
|
||||||
expected = "openstack-nova-compute"
|
expected = "openstack-nova-compute"
|
||||||
expect(@chef_run).to set_service_to_start_on_boot expected
|
expect(@chef_run).to set_service_to_start_on_boot expected
|
||||||
|
|
|
@ -31,6 +31,10 @@ describe "openstack-compute::compute" do
|
||||||
expect(@chef_run).to upgrade_package "nova-compute"
|
expect(@chef_run).to upgrade_package "nova-compute"
|
||||||
end
|
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
|
it "installs kvm when virt_type is 'kvm'" do
|
||||||
chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||||
node = chef_run.node
|
node = chef_run.node
|
||||||
|
|
Loading…
Reference in New Issue