From 06c2bcc7c89e88a0beec63823cbc766ceaabbcdb Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 17 Jul 2013 19:55:50 -0700 Subject: [PATCH] forward additional tempest parameters This commit allows for two additional tempest parameters to be forwarded from the openstack::provision class: * version_to_test * resize_available It also adds some initial and much needed unit tests. Change-Id: I0c352e6f44dc90e055b47db508455972aae2765a --- .fixtures.yml | 2 ++ manifests/provision.pp | 6 +++++- spec/classes/openstack_provision_spec.rb | 27 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 spec/classes/openstack_provision_spec.rb diff --git a/.fixtures.yml b/.fixtures.yml index 5ce53e4..9f24729 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -19,5 +19,7 @@ fixtures: "sysctl": "git://github.com/duritong/puppet-sysctl.git" 'inifile': 'git://github.com/cprice-puppet/puppetlabs-inifile' 'vswitch': 'git://github.com/bodepd/puppet-vswitch' + 'tempest': 'git://github.com/stackforge/puppet-tempest' + 'vcsrepo': 'git://github.com/puppetlabs/puppetlabs-vcsrepo' symlinks: "openstack": "#{source_dir}" diff --git a/manifests/provision.pp b/manifests/provision.pp index eff451b..be51979 100644 --- a/manifests/provision.pp +++ b/manifests/provision.pp @@ -69,7 +69,9 @@ class openstack::provision( $identity_uri = undef, $tempest_clone_path = '/var/lib/tempest', $tempest_clone_owner = 'root', - $setup_venv = false + $setup_venv = false, + $version_to_test = 'master', + $resize_available = undef ) { ## Users @@ -158,6 +160,7 @@ class openstack::provision( tempest_clone_path => $tempest_clone_path, tempest_clone_owner => $tempest_clone_owner, setup_venv => $setup_venv, + version_to_test => $version_to_test, image_name => $image_name, image_name_alt => $image_name, image_ssh_user => $image_ssh_user, @@ -174,6 +177,7 @@ class openstack::provision( admin_tenant_name => $admin_tenant_name, quantum_available => true, public_network_name => $public_network_name, + resize_available => $resize_available, require => [ Keystone_user[$username], Keystone_user[$alt_username], diff --git a/spec/classes/openstack_provision_spec.rb b/spec/classes/openstack_provision_spec.rb new file mode 100644 index 0000000..c97e93b --- /dev/null +++ b/spec/classes/openstack_provision_spec.rb @@ -0,0 +1,27 @@ +require 'spec_helper' + +describe 'openstack::provision' do + + let :facts do + { + :osfamily => 'Debian' + } + end + + describe 'should be possible to override resize_available' do + let :params do + { + :configure_tempest => true, + :resize_available => true, + :version_to_test => 'stable/grizzly' + } + end + + it { should contain_class('tempest').with( + :resize_available => true, + :version_to_test => 'stable/grizzly' + ) } + + end + +end