openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Fix spec to remove internal chef cache path 

No need for spec to check for chef internal cache path. This causes
the spec to fail on other platforms like windows or where these
paths have been modified on the chef install.

Change-Id: I98a45288dd1cd8ac92b3f0d01ba389c6f6813968
Closes-Bug: #1307678
This commit is contained in:
Mark Vanderwiel 2014-05-07 16:34:05 -05:00
parent 268552e009
commit 10f0cd2f8b
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,8 +1,11 @@
# CHANGELOG for cookbook-openstack-network
This file is used to list changes made in each version of cookbook-openstack-network.
## 9.0.4
* Fix to allow build openvswitch spec to work on windows
## 9.0.3
* Fix openvswitch and linuxbridge agent
This file is used to list changes made in each version of cookbook-openstack-network.
## 9.0.2
* Fix to allow data network openvswitch bridge to be created

2
metadata.rb
View File

@ -5,7 +5,7 @@ maintainer 'Jay Pipes <jaypipes@gmail.com>'
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.3'
version '9.0.4'
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'

14
spec/build_openvswitch_source_spec.rb
View File

@ -29,29 +29,33 @@ describe 'openstack-network::build_openvswitch_source' do
# since our mocked version of ubuntu is precise, our compile
# utilities should be installed to build OVS from source
it 'installs openvswitch build dependencies' do
%w(build-essential pkg-config fakeroot libssl-dev openssl debhelper autoconf).each do |pkg|
%w(build-essential pkg-config fakeroot libssl-dev openssl debhelper autoconf dkms python-all python-qt4 python-zopeinterface python-twisted-conch).each do |pkg|
expect(chef_run).to install_package(pkg)
end
end
it 'installs openvswitch switch dpkg' do
ovs_switch.source.should eq '/var/chef/cache/22df718eb81fcfe93228e9bba8575e50/openvswitch-switch_1.10.2-1_amd64.deb'
ovs_switch.source.should include 'openvswitch-switch_1.10.2-1_amd64.deb'
ovs_switch.action.should eq [:nothing]
expect(chef_run).to_not install_dpkg_package(ovs_switch.name)
end
it 'installs openvswitch datapath dkms dpkg' do
ovs_dkms.source.should eq '/var/chef/cache/22df718eb81fcfe93228e9bba8575e50/openvswitch-datapath-dkms_1.10.2-1_all.deb'
ovs_dkms.source.should include 'openvswitch-datapath-dkms_1.10.2-1_all.deb'
ovs_dkms.action.should eq [:nothing]
expect(chef_run).to_not install_dpkg_package(ovs_dkms.name)
end
it 'installs openvswitch pki dpkg' do
ovs_pki.source.should eq '/var/chef/cache/22df718eb81fcfe93228e9bba8575e50/openvswitch-pki_1.10.2-1_all.deb'
ovs_pki.source.should include 'openvswitch-pki_1.10.2-1_all.deb'
ovs_pki.action.should eq [:nothing]
expect(chef_run).to_not install_dpkg_package(ovs_pki.name)
end
it 'installs openvswitch common dpkg' do
ovs_common.source.should eq '/var/chef/cache/22df718eb81fcfe93228e9bba8575e50/openvswitch-common_1.10.2-1_amd64.deb'
ovs_common.source.should include 'openvswitch-common_1.10.2-1_amd64.deb'
ovs_common.action.should eq [:nothing]
expect(chef_run).to_not install_dpkg_package(ovs_common.name)
end
end
end