openstack/puppet-nova
Code Issues Proposed changes

Fix beaker tests

Browse Source 
- This patch drops the support of CentOS-6.x on Kilo.

Change-Id: I30b764a52ccc57fe5f48ec16ccdc9a968a1a6f38
This commit is contained in:
Spencer Krum 2015-02-11 21:11:10 -08:00 committed by Gael Chamoulaud
parent 861117a3e3
commit 9b7e920bfc
7 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spec/acceptance/class_spec.rb
View File

@ -15,7 +15,6 @@ describe 'nova class' do
glance_api_servers => 'localhost:9292',
verbose => false,
rabbit_host => '127.0.0.1',
mysql_module => '2.2',
}
class { 'nova::compute':

10
spec/acceptance/nodesets/centos-64-x64.yml
View File

@ -1,10 +0,0 @@
HOSTS:
centos-64-x64:
roles:
- master
platform: el-6-x86_64
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss

9
spec/acceptance/nodesets/centos-70-x64.yml Normal file
View File

@ -0,0 +1,9 @@
HOSTS:
centos-70-x64:
roles:
- master
platform: el-7-x86_64
box : puppetlabs/centos-7.0-64-puppet
hypervisor : vagrant
CONFIG:
type: foss

9
spec/acceptance/nodesets/default.yml
View File

@ -1,9 +0,0 @@
HOSTS:
ubuntu-server-14041-x64:
roles:
- master
platform: ubuntu-14.04-amd64
hypervisor : none
ip: 127.0.0.1
CONFIG:
type: foss

4
spec/acceptance/nodesets/nodepool.yml
View File

@ -1,8 +1,8 @@
HOSTS:
ubuntu-server-12042-x64:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-12.04-amd64
platform: ubuntu-14.04-amd64
hypervisor : none
ip: 127.0.0.1
CONFIG:

11
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml Normal file
View File

@ -0,0 +1,11 @@
HOSTS:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
box : trusty-server-cloudimg-amd64-vagrant-disk1
box_url : https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box
hypervisor : vagrant
CONFIG:
log_level : debug
type: git

27
spec/spec_helper_acceptance.rb
View File

@ -16,19 +16,32 @@ RSpec.configure do |c|
# Configure all nodes in nodeset
c.before :suite do
# Install module
puppet_module_install(:source => proj_root, :module_name => 'nova')
hosts.each do |host|
# install git
install_package host, 'git'
# clean out any module cruft
shell('rm -fr /etc/puppet/modules/*')
# install library modules from the forge
on host, puppet('module','install', 'puppetlabs-mysql', '--version', '3.2.0'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','duritong/sysctl'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-cinder'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-glance'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-keystone'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-mysql', '--version', '2.2'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-rabbitmq'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
# install puppet modules from git, use master
shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')
shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
shell('git clone https://git.openstack.org/stackforge/puppet-cinder /etc/puppet/modules/cinder')
shell('git clone https://git.openstack.org/stackforge/puppet-glance /etc/puppet/modules/glance')
# Install the module being tested
puppet_module_install(:source => proj_root, :module_name => 'nova')
# List modules installed to help with debugging
on hosts[0], puppet('module','list'), { :acceptable_exit_codes => [0,1] }
end
end
end