diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef101b3..254b255e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # CHANGELOG for cookbook-openstack-network This file is used to list changes made in each version of cookbook-openstack-network. +## 9.0.1 +* Fix package action to allow updates + ## 9.0.0 * Upgrade to Icehouse * The balancer recipe now includes openstack-network::common diff --git a/metadata.rb b/metadata.rb index 5a69ef9a..aa97e0a3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ maintainer 'Jay Pipes ' license 'Apache 2.0' description 'Installs and configures the OpenStack Network API Service and various agents and plugins' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '9.0.0' +version '9.0.1' recipe 'openstack-network::client', 'Install packages required for network client' recipe 'openstack-network::server', 'Installs packages required for a OpenStack Network server' recipe 'openstack-network::openvswitch', 'Installs packages required for OVS' diff --git a/recipes/balancer.rb b/recipes/balancer.rb index 74f36bc3..deb20c9c 100644 --- a/recipes/balancer.rb +++ b/recipes/balancer.rb @@ -29,7 +29,8 @@ platform_options = node['openstack']['network']['platform'] platform_options['neutron_lb_packages'].each do |pkg| package pkg do - action :install + options platform_options['package_overrides'] + action :upgrade end end diff --git a/recipes/common.rb b/recipes/common.rb index 63404e15..5d8373af 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -52,7 +52,7 @@ end platform_options['neutron_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end @@ -60,7 +60,7 @@ db_type = node['openstack']['db']['network']['service_type'] platform_options["#{db_type}_python_packages"].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end diff --git a/recipes/dhcp_agent.rb b/recipes/dhcp_agent.rb index 8a6abb9c..623da8bc 100644 --- a/recipes/dhcp_agent.rb +++ b/recipes/dhcp_agent.rb @@ -29,7 +29,7 @@ main_plugin = node['openstack']['network']['core_plugin_map'][core_plugin.split( platform_options['neutron_dhcp_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end @@ -45,7 +45,7 @@ end # Python package and include the plugin-specific recipe here... package platform_options['neutron_plugin_package'].gsub('%plugin%', main_plugin) do options platform_options['package_overrides'] - action :install + action :upgrade # plugins are installed by the main openstack-neutron package on SUSE not_if { platform_family? 'suse' } end @@ -80,7 +80,7 @@ end if node['lsb'] && node['lsb']['codename'] == 'precise' && node['openstack']['network']['dhcp']['dnsmasq_compile'] == true platform_options['neutron_dhcp_build_packages'].each do |pkg| package pkg do - action :install + action :upgrade end end diff --git a/recipes/l3_agent.rb b/recipes/l3_agent.rb index d010200d..e3a50e67 100644 --- a/recipes/l3_agent.rb +++ b/recipes/l3_agent.rb @@ -29,7 +29,7 @@ main_plugin = node['openstack']['network']['core_plugin_map'][core_plugin.split( platform_options['neutron_l3_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade # The providers below do not use the generic L3 agent... not_if { ['nicira', 'plumgrid', 'bigswitch'].include?(main_plugin) } end diff --git a/recipes/linuxbridge.rb b/recipes/linuxbridge.rb index c111e27c..90d78626 100644 --- a/recipes/linuxbridge.rb +++ b/recipes/linuxbridge.rb @@ -27,7 +27,7 @@ platform_options = node['openstack']['network']['platform'] platform_options['neutron_linuxbridge_agent_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end diff --git a/recipes/metadata_agent.rb b/recipes/metadata_agent.rb index 483a7e0a..0ad80218 100644 --- a/recipes/metadata_agent.rb +++ b/recipes/metadata_agent.rb @@ -44,7 +44,7 @@ end platform_options['neutron_metadata_agent_packages'].each do |pkg| package pkg do - action :install + action :upgrade options platform_options['package_overrides'] end end diff --git a/recipes/openvswitch.rb b/recipes/openvswitch.rb index d8d86ff0..c324289f 100644 --- a/recipes/openvswitch.rb +++ b/recipes/openvswitch.rb @@ -40,7 +40,7 @@ if platform_family?('debian') kernel_ver = node['kernel']['release'] package "linux-headers-#{kernel_ver}" do options platform_options['package_overrides'] - action :install + action :upgrade end end @@ -53,7 +53,7 @@ else platform_options['neutron_openvswitch_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end end @@ -92,7 +92,7 @@ end platform_options['neutron_openvswitch_agent_packages'].each do |pkg| package pkg do - action :install + action :upgrade options platform_options['package_overrides'] end end @@ -129,7 +129,7 @@ end if node['openstack']['network']['disable_offload'] package 'ethtool' do - action :install + action :upgrade options platform_options['package_overrides'] end diff --git a/recipes/server.rb b/recipes/server.rb index 681aef57..70a7f1d1 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -34,7 +34,7 @@ core_plugin = node['openstack']['network']['core_plugin'] platform_options['neutron_server_packages'].each do |pkg| package pkg do options platform_options['package_overrides'] - action :install + action :upgrade end end diff --git a/spec/balancer-redhat_spec.rb b/spec/balancer-redhat_spec.rb index fda2d90b..0527cf5e 100644 --- a/spec/balancer-redhat_spec.rb +++ b/spec/balancer-redhat_spec.rb @@ -14,8 +14,8 @@ describe 'openstack-network::balancer' do include_context 'neutron-stubs' ['haproxy', 'openstack-neutron'].each do |pack| - it "installs #{pack} package" do - expect(chef_run).to install_package(pack) + it "upgrades #{pack} package" do + expect(chef_run).to upgrade_package(pack) end end diff --git a/spec/balancer-suse_spec.rb b/spec/balancer-suse_spec.rb index 8300e1f2..cf7f9ea3 100644 --- a/spec/balancer-suse_spec.rb +++ b/spec/balancer-suse_spec.rb @@ -14,8 +14,8 @@ describe 'openstack-network::balancer' do include_context 'neutron-stubs' ['openstack-neutron-lbaas-agent'].each do |pack| - it "installs #{pack} package" do - expect(chef_run).to install_package(pack) + it "upgrades #{pack} package" do + expect(chef_run).to upgrade_package(pack) end end diff --git a/spec/balancer_spec.rb b/spec/balancer_spec.rb index 45c89368..f7536929 100644 --- a/spec/balancer_spec.rb +++ b/spec/balancer_spec.rb @@ -17,15 +17,15 @@ describe 'openstack-network::balancer' do expect(chef_run.service('neutron-lb-agent')).to subscribe_to('template[/etc/neutron/neutron.conf]').delayed end - it 'does not install neutron-lbaas-agent when nova networking.' do + it 'does not upgrade neutron-lbaas-agent when nova networking.' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('neutron-lbaas-agent') + expect(chef_run).to_not upgrade_package('neutron-lbaas-agent') end ['haproxy', 'neutron-lbaas-agent'].each do |pack| - it "installs #{pack} package" do - expect(chef_run).to install_package(pack) + it "upgrades #{pack} package" do + expect(chef_run).to upgrade_package(pack) end end diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb index 54370b89..628222dd 100644 --- a/spec/client-redhat_spec.rb +++ b/spec/client-redhat_spec.rb @@ -9,7 +9,7 @@ describe 'openstack-network::client' do runner.converge(described_recipe) end - it 'installs packages' do + it 'upgrades python neutron client package' do expect(chef_run).to upgrade_package('python-neutronclient') end end diff --git a/spec/client_spec.rb b/spec/client_spec.rb index 449477ed..d6902711 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -9,7 +9,7 @@ describe 'openstack-network::client' do runner.converge(described_recipe) end - it 'installs packages' do + it 'upgrades python neutron client package' do expect(chef_run).to upgrade_package('python-neutronclient') expect(chef_run).to upgrade_package('python-pyparsing') end diff --git a/spec/common-redhat_spec.rb b/spec/common-redhat_spec.rb index cb63bb08..44b123dd 100644 --- a/spec/common-redhat_spec.rb +++ b/spec/common-redhat_spec.rb @@ -13,15 +13,15 @@ describe 'openstack-network::common' do include_context 'neutron-stubs' - it 'installs mysql python packages by default' do - expect(chef_run).to install_package('MySQL-python') + it 'upgrades mysql python package' do + expect(chef_run).to upgrade_package('MySQL-python') end - it 'installs db2 python packages if explicitly told' do + it 'upgrades db2 python packages if explicitly told' do node.set['openstack']['db']['network']['service_type'] = 'db2' ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| - expect(chef_run).to install_package(pkg) + expect(chef_run).to upgrade_package(pkg) end end end diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 97030c1a..778585e2 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -13,22 +13,22 @@ describe 'openstack-network::common' do include_context 'neutron-stubs' - it 'does not install python-neutronclient when nova networking' do + it 'does not upgrade python-neutronclient when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('python-neutronclient') + expect(chef_run).to_not upgrade_package('python-neutronclient') end - it 'upgrades python neutronclient' do + it 'upgrades python neutronclient package' do expect(chef_run).to upgrade_package('python-neutronclient') end - it 'upgrades python pyparsing' do + it 'upgrades python pyparsing package' do expect(chef_run).to upgrade_package('python-pyparsing') end - it 'installs mysql python packages by default' do - expect(chef_run).to install_package('python-mysqldb') + it 'upgrades mysql python package' do + expect(chef_run).to upgrade_package('python-mysqldb') end describe 'neutron.conf' do diff --git a/spec/dhcp_agent-suse_spec.rb b/spec/dhcp_agent-suse_spec.rb index b4d13900..1932acd6 100644 --- a/spec/dhcp_agent-suse_spec.rb +++ b/spec/dhcp_agent-suse_spec.rb @@ -16,16 +16,16 @@ describe 'openstack-network::dhcp_agent' do it 'does not install openstack-neutron-dhcp-agent when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('openstack-neutron-dhcp-agent') + expect(chef_run).to_not upgrade_package('openstack-neutron-dhcp-agent') end - it 'installs quamtum dhcp package' do - expect(chef_run).to install_package('openstack-neutron-dhcp-agent') + it 'upgrades neutron dhcp package' do + expect(chef_run).to upgrade_package('openstack-neutron-dhcp-agent') end - it 'installs plugin packages' do - expect(chef_run).not_to install_package(/openvswitch/) - expect(chef_run).not_to install_package(/plugin/) + it 'upgrades plugin packages' do + expect(chef_run).not_to upgrade_package(/openvswitch/) + expect(chef_run).not_to upgrade_package(/plugin/) end it 'starts the dhcp agent on boot' do diff --git a/spec/dhcp_agent_spec.rb b/spec/dhcp_agent_spec.rb index 64480d43..afd617e7 100644 --- a/spec/dhcp_agent_spec.rb +++ b/spec/dhcp_agent_spec.rb @@ -24,9 +24,9 @@ describe 'openstack-network::dhcp_agent' do # since our mocked version of ubuntu is precise, our compile # utilities should be installed to build dnsmasq - it 'installs dnsmasq build dependencies' do + it 'upgrades dnsmasq build dependencies' do %w(build-essential pkg-config libidn11-dev libdbus-1-dev libnetfilter-conntrack-dev gettext).each do |pkg| - expect(chef_run).to install_package pkg + expect(chef_run).to upgrade_package pkg end end @@ -34,16 +34,16 @@ describe 'openstack-network::dhcp_agent' do node.set['openstack']['network']['dhcp']['dnsmasq_compile'] = false %w(build-essential pkg-config libidn11-dev libdbus-1-dev libnetfilter-conntrack-dev gettext).each do |pkg| - expect(chef_run).to_not install_package pkg + expect(chef_run).to_not upgrade_package pkg end end - it 'installs neutron dhcp package' do - expect(chef_run).to install_package 'neutron-dhcp-agent' + it 'upgrades neutron dhcp package' do + expect(chef_run).to upgrade_package 'neutron-dhcp-agent' end - it 'installs plugin packages' do - expect(chef_run).to install_package 'neutron-plugin-ml2' + it 'upgrades plugin package' do + expect(chef_run).to upgrade_package 'neutron-plugin-ml2' end it 'starts the dhcp agent on boot' do diff --git a/spec/l3_agent_spec.rb b/spec/l3_agent_spec.rb index 6c7c2c50..87d7f4c0 100644 --- a/spec/l3_agent_spec.rb +++ b/spec/l3_agent_spec.rb @@ -26,11 +26,11 @@ describe 'openstack-network::l3_agent' do it 'does not install neutron l3 package when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('neutron-l3-agent') + expect(chef_run).to_not upgrade_package('neutron-l3-agent') end - it 'installs quamtum l3 package' do - expect(chef_run).to install_package('neutron-l3-agent') + it 'upgrades neutron l3 package' do + expect(chef_run).to upgrade_package('neutron-l3-agent') end describe 'l3_agent.ini' do diff --git a/spec/linuxbridge-redhat_spec.rb b/spec/linuxbridge-redhat_spec.rb index 789f2935..49a6f388 100644 --- a/spec/linuxbridge-redhat_spec.rb +++ b/spec/linuxbridge-redhat_spec.rb @@ -19,11 +19,11 @@ describe 'openstack-network::linuxbridge' do it 'does not install linuxbridge agent package when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('openstack-neutron-linuxbridge') + expect(chef_run).to_not upgrade_package('openstack-neutron-linuxbridge') end - it 'installs linuxbridge agent' do - expect(chef_run).to install_package('openstack-neutron-linuxbridge') + it 'upgrades linuxbridge agent' do + expect(chef_run).to upgrade_package('openstack-neutron-linuxbridge') end it 'sets the linuxbridge service to start on boot' do diff --git a/spec/linuxbridge-suse_spec.rb b/spec/linuxbridge-suse_spec.rb index 24f22c31..dc9980ae 100644 --- a/spec/linuxbridge-suse_spec.rb +++ b/spec/linuxbridge-suse_spec.rb @@ -18,11 +18,11 @@ describe 'openstack-network::linuxbridge' do it 'does not install linuxbridge agent package when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('openstack-neutron-linuxbridge-agent') + expect(chef_run).to_not upgrade_package('openstack-neutron-linuxbridge-agent') end - it 'installs linuxbridge agent' do - expect(chef_run).to install_package('openstack-neutron-linuxbridge-agent') + it 'upgrades linuxbridge agent' do + expect(chef_run).to upgrade_package('openstack-neutron-linuxbridge-agent') end it 'sets the linuxbridge service to start on boot' do diff --git a/spec/linuxbridge_spec.rb b/spec/linuxbridge_spec.rb index d3698470..59ee6e87 100644 --- a/spec/linuxbridge_spec.rb +++ b/spec/linuxbridge_spec.rb @@ -18,11 +18,11 @@ describe 'openstack-network::linuxbridge' do it 'does not install linuxbridge agent package when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package('neutron-plugin-linuxbridge-agent') + expect(chef_run).to_not upgrade_package('neutron-plugin-linuxbridge-agent') end - it 'installs linuxbridge agent' do - expect(chef_run).to install_package('neutron-plugin-linuxbridge-agent') + it 'upgrades linuxbridge agent' do + expect(chef_run).to upgrade_package('neutron-plugin-linuxbridge-agent') end it 'sets the linuxbridge service to start on boot' do diff --git a/spec/metadata_agent_spec.rb b/spec/metadata_agent_spec.rb index 49c23263..28530863 100644 --- a/spec/metadata_agent_spec.rb +++ b/spec/metadata_agent_spec.rb @@ -12,14 +12,14 @@ describe 'openstack-network::metadata_agent' do include_context 'neutron-stubs' - it 'does not install quamtum metadata agent when nova networking' do + it 'does not install neutron metadata agent when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'neutron-metadata-agent' + expect(chef_run).to_not upgrade_package 'neutron-metadata-agent' end - it 'installs quamtum metadata agent' do - expect(chef_run).to install_package 'neutron-metadata-agent' + it 'upgrades neutron metadata agent' do + expect(chef_run).to upgrade_package 'neutron-metadata-agent' end it 'subscribes the metadata agent service to neutron.conf' do diff --git a/spec/openvswitch-suse_spec.rb b/spec/openvswitch-suse_spec.rb index 65524656..67c7c084 100644 --- a/spec/openvswitch-suse_spec.rb +++ b/spec/openvswitch-suse_spec.rb @@ -16,15 +16,15 @@ describe 'openstack-network::openvswitch' do it 'does not install openvswitch package when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'openvswitch-switch' + expect(chef_run).to_not upgrade_package 'openvswitch-switch' end - it 'installs the openvswitch package' do - expect(chef_run).to install_package 'openvswitch-switch' + it 'upgrades the openvswitch package' do + expect(chef_run).to upgrade_package 'openvswitch-switch' end - it 'installs the openvswitch-agent package' do - expect(chef_run).to install_package 'openstack-neutron-openvswitch-agent' + it 'upgrades the openvswitch-agent package' do + expect(chef_run).to upgrade_package 'openstack-neutron-openvswitch-agent' end it 'starts the openvswitch-switch service' do diff --git a/spec/openvswitch_spec.rb b/spec/openvswitch_spec.rb index 46f98a9c..10421e1a 100644 --- a/spec/openvswitch_spec.rb +++ b/spec/openvswitch_spec.rb @@ -21,23 +21,23 @@ describe 'openstack-network::openvswitch' do it 'does not install openvswitch switch when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'openvswitch-switch' + expect(chef_run).to_not upgrade_package 'openvswitch-switch' end - it 'installs openvswitch switch' do - expect(chef_run).to install_package 'openvswitch-switch' + it 'upgrades openvswitch switch' do + expect(chef_run).to upgrade_package 'openvswitch-switch' end - it 'installs openvswitch datapath dkms' do - expect(chef_run).to install_package 'openvswitch-datapath-dkms' + it 'upgrades openvswitch datapath dkms' do + expect(chef_run).to upgrade_package 'openvswitch-datapath-dkms' end - it 'installs linux bridge utils' do - expect(chef_run).to install_package 'bridge-utils' + it 'upgrades linux bridge utils' do + expect(chef_run).to upgrade_package 'bridge-utils' end - it 'installs linux linux headers' do - expect(chef_run).to install_package 'linux-headers-1.2.3' + it 'upgrades linux linux headers' do + expect(chef_run).to upgrade_package 'linux-headers-1.2.3' end it 'sets the openvswitch service to start on boot' do @@ -52,8 +52,8 @@ describe 'openstack-network::openvswitch' do expect(chef_run.service('neutron-plugin-openvswitch-agent')).to subscribe_to('template[/etc/neutron/neutron.conf]').delayed end - it 'installs openvswitch agent' do - expect(chef_run).to install_package 'neutron-plugin-openvswitch-agent' + it 'upgrades openvswitch agent' do + expect(chef_run).to upgrade_package 'neutron-plugin-openvswitch-agent' end it 'sets the openvswitch service to start on boot' do @@ -73,7 +73,7 @@ describe 'openstack-network::openvswitch' do node.set['openstack']['network']['platform']['package_overrides'] = '--my-override1 --my-override2' %w{openvswitch-switch openvswitch-datapath-dkms neutron-plugin-openvswitch neutron-plugin-openvswitch-agent}.each do |pkg| - expect(chef_run).to install_package(pkg).with(options: '--my-override1 --my-override2') + expect(chef_run).to upgrade_package(pkg).with(options: '--my-override1 --my-override2') end end @@ -82,7 +82,7 @@ describe 'openstack-network::openvswitch' do node.set['openstack']['network']['platform']['neutron_openvswitch_agent_packages'] = ['my-openvswitch-agent', 'my-other-openvswitch-agent'] %w{my-openvswitch my-other-openvswitch my-openvswitch-agent my-other-openvswitch-agent}.each do |pkg| - expect(chef_run).to install_package(pkg) + expect(chef_run).to upgrade_package(pkg) end end diff --git a/spec/server-redhat_spec.rb b/spec/server-redhat_spec.rb index 5f9ca8cd..675d41c8 100644 --- a/spec/server-redhat_spec.rb +++ b/spec/server-redhat_spec.rb @@ -15,19 +15,19 @@ describe 'openstack-network::server' do it 'does not install openstack-neutron when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'openstack-neutron' + expect(chef_run).to_not upgrade_package 'openstack-neutron' end - it 'installs openstack-neutron packages' do - expect(chef_run).to install_package 'openstack-neutron' + it 'upgrades openstack-neutron packages' do + expect(chef_run).to upgrade_package 'openstack-neutron' end it 'enables openstack-neutron server service' do expect(chef_run).to enable_service 'neutron-server' end - it 'does not install openvswitch package' do - expect(chef_run).not_to install_package 'openvswitch' + it 'does not upgrade openvswitch package' do + expect(chef_run).not_to upgrade_package 'openvswitch' expect(chef_run).not_to enable_service 'neutron-openvswitch-agent' end end diff --git a/spec/server-suse_spec.rb b/spec/server-suse_spec.rb index ea2ab040..ade3605b 100644 --- a/spec/server-suse_spec.rb +++ b/spec/server-suse_spec.rb @@ -15,19 +15,19 @@ describe 'openstack-network::server' do it 'does not install openstack-neutron when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'openstack-neutron' + expect(chef_run).to_not upgrade_package 'openstack-neutron' end - it 'installs openstack-neutron packages' do - expect(chef_run).to install_package 'openstack-neutron' + it 'upgrades openstack-neutron packages' do + expect(chef_run).to upgrade_package 'openstack-neutron' end it 'enables openstack-neutron service' do expect(chef_run).to enable_service 'openstack-neutron' end - it 'does not install openvswitch package' do - expect(chef_run).not_to install_package 'openstack-neutron-openvswitch' + it 'does not upgrade openvswitch package' do + expect(chef_run).not_to upgrade_package 'openstack-neutron-openvswitch' end describe '/etc/sysconfig/neutron' do diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 170e3264..ab63213f 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -20,12 +20,12 @@ describe 'openstack-network::server' do it 'does not install neutron-server when nova networking' do node.override['openstack']['compute']['network']['service_type'] = 'nova' - expect(chef_run).to_not install_package 'neutron-server' + expect(chef_run).to_not upgrade_package 'neutron-server' end describe 'package and services' do - it 'installs neutron-server packages' do - expect(chef_run).to install_package 'neutron-server' + it 'upgrades neutron-server packages' do + expect(chef_run).to upgrade_package 'neutron-server' end it 'allows overriding package names' do @@ -33,7 +33,7 @@ describe 'openstack-network::server' do node.set['openstack']['network']['platform']['neutron_server_packages'] = cust_pkgs cust_pkgs.each do |pkg| - expect(chef_run).to install_package(pkg) + expect(chef_run).to upgrade_package(pkg) end end @@ -51,12 +51,12 @@ describe 'openstack-network::server' do cust_opts = "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef' --force-yes" node.set['openstack']['network']['platform']['package_overrides'] = cust_opts - expect(chef_run).to install_package('neutron-server').with(options: cust_opts) + expect(chef_run).to upgrade_package('neutron-server').with(options: cust_opts) end - it 'does not install openvswitch package or the agent' do - expect(chef_run).not_to install_package 'openvswitch' - expect(chef_run).not_to install_package 'neutron-plugin-openvswitch-agent' + it 'does not upgrade openvswitch package or the agent' do + expect(chef_run).not_to upgrade_package 'openvswitch' + expect(chef_run).not_to upgrade_package 'neutron-plugin-openvswitch-agent' expect(chef_run).not_to enable_service 'neutron-plugin-openvswitch-agent' end end @@ -434,7 +434,7 @@ describe 'openstack-network::server' do end end - it 'does not install sysconfig template' do + it 'does not create sysconfig template' do stub_command(/python/).and_return(true) expect(chef_run).not_to create_file('/etc/sysconfig/neutron') end