Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update only Puppet Modules from Stackforge (Master) #264

Merged
merged 12 commits into from
Feb 26, 2015
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tempest to 48a850e38f7937e19b687f7a18c6b7d388ea1069
48a850e38f7937e19b687f7a18c6b7d388ea1069 spec: pin rspec-puppet to 1.0.1
7350af50f6569afcff33972d7807cc6d91d8c5a9 Merge "Allow to not manage Tempest code in Puppet"
05fc037265964e16429639e26601d8fd6d28ec4c Allow to not manage Tempest code in Puppet
beb7add18570713e71e8186403bda44f200d7bcb Allow to activate Ceilometer tests
12cd4dcd68eb0a09a4d061325e708bc53bcf280f Release 5.0.0 - Juno
ce2337a0d2df4f07be3db7df4c4aafcc574fa703 Switch to metadata.json for Puppet forge releases
b293e997f405fbc55161300d03b685554adf80c3 Update vcsrepo max dependency to 2.x

Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
strider committed Feb 19, 2015
commit d8fb627b3bc2553b34f8b330532a215100f09ec7
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ mod 'sysctl',
:git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'

mod 'tempest',
:commit => '7a3369949fc8af41e190dd8115391354a7575ecb',
:commit => '48a850e38f7937e19b687f7a18c6b7d388ea1069',
:git => 'https://github.com/stackforge/puppet-tempest.git'

mod 'timezone',
1 change: 1 addition & 0 deletions tempest/Gemfile
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 0.3.2'
gem 'rspec-puppet', '~> 1.0.1'
gem 'rake', '10.1.1'
gem 'rspec', '< 2.99'
gem 'json'
12 changes: 0 additions & 12 deletions tempest/Modulefile

This file was deleted.

17 changes: 17 additions & 0 deletions tempest/README.markdown
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
Tempest
=======

5.0.0 - 2014.2.0 - Juno

Module for installing and configuring tempest.

Tempest is the test suite that can be used to run integration
tests on an installed openstack environment.

This module assumes the provisioning of the initial OpenStack
resources has been done beforehand.

Release Notes
-------------

** 5.0.0 **

* Stable Juno release
* Pinned vcsrepo dependency to 2.x
* Bumped stdlib dependency to 4.x
* Added ability to hide secrets from puppet logs
* Removed orphaned os_concat function
* Removed dependencies on mysql and postgresql devel libraries
101 changes: 56 additions & 45 deletions tempest/manifests/init.pp
Original file line number Diff line number Diff line change
@@ -6,6 +6,9 @@
# managed in tempest.conf.
#
class tempest(
$install_from_source = true,
$tempest_config_file = '/var/lib/tempest/etc/tempest.conf',

# Clone config
#
$tempest_repo_uri = 'git://github.com/openstack/tempest.git',
@@ -64,6 +67,7 @@
$cinder_available = true,
$glance_available = true,
$heat_available = false,
$ceilometer_available = false,
$horizon_available = true,
$neutron_available = false,
$nova_available = true,
@@ -72,60 +76,66 @@

include 'tempest::params'

ensure_packages([
'git',
'python-setuptools',
])
if $install_from_source {
ensure_packages([
'git',
'python-setuptools',
])

ensure_packages($tempest::params::dev_packages)
ensure_packages($tempest::params::dev_packages)

exec { 'install-pip':
command => '/usr/bin/easy_install pip',
unless => '/usr/bin/which pip',
require => Package['python-setuptools'],
}
exec { 'install-pip':
command => '/usr/bin/easy_install pip',
unless => '/usr/bin/which pip',
require => Package['python-setuptools'],
}

exec { 'install-tox':
command => "${tempest::params::pip_bin_path}/pip install -U tox",
unless => '/usr/bin/which tox',
require => Exec['install-pip'],
}
exec { 'install-tox':
command => "${tempest::params::pip_bin_path}/pip install -U tox",
unless => '/usr/bin/which tox',
require => Exec['install-pip'],
}

vcsrepo { $tempest_clone_path:
ensure => 'present',
source => $tempest_repo_uri,
revision => $tempest_repo_revision,
provider => 'git',
require => Package['git'],
user => $tempest_clone_owner,
}
vcsrepo { $tempest_clone_path:
ensure => 'present',
source => $tempest_repo_uri,
revision => $tempest_repo_revision,
provider => 'git',
require => Package['git'],
user => $tempest_clone_owner,
}

if $setup_venv {
# virtualenv will be installed along with tox
exec { 'setup-venv':
command => "/usr/bin/python ${tempest_clone_path}/tools/install_venv.py",
cwd => $tempest_clone_path,
unless => "/usr/bin/test -d ${tempest_clone_path}/.venv",
require => [
Vcsrepo[$tempest_clone_path],
Exec['install-tox'],
Package[$tempest::params::dev_packages],
],
if $setup_venv {
# virtualenv will be installed along with tox
exec { 'setup-venv':
command => "/usr/bin/python ${tempest_clone_path}/tools/install_venv.py",
cwd => $tempest_clone_path,
unless => "/usr/bin/test -d ${tempest_clone_path}/.venv",
require => [
Vcsrepo[$tempest_clone_path],
Exec['install-tox'],
Package[$tempest::params::dev_packages],
],
}
}
}

$tempest_conf = "${tempest_clone_path}/etc/tempest.conf"
$tempest_conf = "${tempest_clone_path}/etc/tempest.conf"

file { $tempest_conf:
replace => false,
source => "${tempest_conf}.sample",
require => Vcsrepo[$tempest_clone_path],
owner => $tempest_clone_owner,
}
file { $tempest_conf:
replace => false,
source => "${tempest_conf}.sample",
require => Vcsrepo[$tempest_clone_path],
owner => $tempest_clone_owner,
}

Tempest_config {
path => $tempest_conf,
require => File[$tempest_conf],
Tempest_config {
path => $tempest_conf,
require => File[$tempest_conf],
}
} else {
Tempest_config {
path => $tempest_config_file,
}
}

tempest_config {
@@ -154,6 +164,7 @@
'service_available/cinder': value => $cinder_available;
'service_available/glance': value => $glance_available;
'service_available/heat': value => $heat_available;
'service_available/ceilometer': value => $ceilometer_available;
'service_available/horizon': value => $horizon_available;
'service_available/neutron': value => $neutron_available;
'service_available/nova': value => $nova_available;
38 changes: 38 additions & 0 deletions tempest/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "stackforge-tempest",
"version": "5.0.0",
"author": "StackForge Contributors",
"summary": "Puppet module for OpenStack Tempest",
"license": "Apache License 2.0",
"source": "git://github.com/stackforge/puppet-tempest.git",
"project_page": "https://launchpad.net/puppet-tempest",
"issues_url": "https://bugs.launchpad.net/puppet-tempest",
"requirements": [
{"name": "pe","version_requirement": "3.x"},
{"name": "puppet","version_requirement": "3.x"}
],
"operatingsystem_support": [
{
"operatingsystem": "Debian",
"operatingsystemrelease": ["7"]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": ["20"]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": ["6.5","7"]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": ["12.04","14.04"]
}
],
"description": "Installs and configures OpenStack Tempest (Quality Assurance).",
"dependencies": [
{ "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
{ "name": "puppetlabs/vcsrepo", "version_requirement": ">=0.1.2 <2.0.0"}
]
}
1 change: 1 addition & 0 deletions tempest/spec/classes/tempest_spec.rb
Original file line number Diff line number Diff line change
@@ -173,6 +173,7 @@
should contain_tempest_config('service_available/cinder').with(:value => true)
should contain_tempest_config('service_available/glance').with(:value => true)
should contain_tempest_config('service_available/heat').with(:value => false)
should contain_tempest_config('service_available/ceilometer').with(:value => false)
should contain_tempest_config('service_available/horizon').with(:value => true)
should contain_tempest_config('service_available/neutron').with(:value => true)
should contain_tempest_config('service_available/nova').with(:value => true)