From e98e906d8c3bc70f7395ce92584e4e481909541f Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 22 Jul 2013 16:08:10 -0700 Subject: [PATCH] Add change_password_available param Add change_password_available parameter so that we can configure tempest to not run tests that require changing the VMs password. Change-Id: I98067790530ab153e1a316c4789fc1fb2ee96b79 --- manifests/provision.pp | 116 ++++++++++++----------- spec/classes/openstack_provision_spec.rb | 12 ++- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/manifests/provision.pp b/manifests/provision.pp index be51979..b14542f 100644 --- a/manifests/provision.pp +++ b/manifests/provision.pp @@ -35,43 +35,44 @@ class openstack::provision( ## Keystone # non admin user - $username = 'demo', - $password = 'pass', - $tenant_name = 'demo', + $username = 'demo', + $password = 'pass', + $tenant_name = 'demo', # another non-admin user - $alt_username = 'alt_demo', - $alt_password = 'pass', - $alt_tenant_name = 'alt_demo', + $alt_username = 'alt_demo', + $alt_password = 'pass', + $alt_tenant_name = 'alt_demo', # admin user - $admin_username = 'admin', - $admin_password = 'pass', - $admin_tenant_name = 'admin', + $admin_username = 'admin', + $admin_password = 'pass', + $admin_tenant_name = 'admin', ## Glance - $image_name = 'cirros', - $image_source = 'http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img', - $image_ssh_user = 'cirros', + $image_name = 'cirros', + $image_source = 'http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img', + $image_ssh_user = 'cirros', ## Quantum - $tenant_name = 'demo', - $public_network_name = 'public', - $public_subnet_name = 'public_subnet', - $floating_range = '172.24.4.224/28', - $private_network_name = 'private', - $private_subnet_name = 'private_subnet', - $fixed_range = '10.0.0.0/24', - $router_name = 'router1', - $setup_ovs_bridge = false, - $public_bridge_name = 'br-ex', + $tenant_name = 'demo', + $public_network_name = 'public', + $public_subnet_name = 'public_subnet', + $floating_range = '172.24.4.224/28', + $private_network_name = 'private', + $private_subnet_name = 'private_subnet', + $fixed_range = '10.0.0.0/24', + $router_name = 'router1', + $setup_ovs_bridge = false, + $public_bridge_name = 'br-ex', ## Tempest - $configure_tempest = false, - $identity_uri = undef, - $tempest_clone_path = '/var/lib/tempest', - $tempest_clone_owner = 'root', - $setup_venv = false, - $version_to_test = 'master', - $resize_available = undef + $configure_tempest = false, + $identity_uri = undef, + $tempest_clone_path = '/var/lib/tempest', + $tempest_clone_owner = 'root', + $setup_venv = false, + $version_to_test = 'master', + $resize_available = undef, + $change_password_available = undef ) { ## Users @@ -156,34 +157,35 @@ class openstack::provision( if $configure_tempest { class { 'tempest': - tempest_repo_uri => $tempest_repo_uri, - 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, - image_alt_ssh_user => $image_ssh_user, - identity_uri => $identity_uri, - username => $username, - password => $password, - tenant_name => $tenant_name, - alt_username => $alt_username, - alt_password => $alt_password, - alt_tenant_name => $alt_tenant_name, - admin_username => $admin_username, - admin_password => $admin_password, - 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], - Glance_image[$image_name], - Quantum_network[$public_network_name], - ], + tempest_repo_uri => $tempest_repo_uri, + 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, + image_alt_ssh_user => $image_ssh_user, + identity_uri => $identity_uri, + username => $username, + password => $password, + tenant_name => $tenant_name, + alt_username => $alt_username, + alt_password => $alt_password, + alt_tenant_name => $alt_tenant_name, + admin_username => $admin_username, + admin_password => $admin_password, + admin_tenant_name => $admin_tenant_name, + quantum_available => true, + public_network_name => $public_network_name, + resize_available => $resize_available, + change_password_available => $change_password_available, + require => [ + Keystone_user[$username], + Keystone_user[$alt_username], + Glance_image[$image_name], + Quantum_network[$public_network_name], + ], } } diff --git a/spec/classes/openstack_provision_spec.rb b/spec/classes/openstack_provision_spec.rb index c97e93b..17472dc 100644 --- a/spec/classes/openstack_provision_spec.rb +++ b/spec/classes/openstack_provision_spec.rb @@ -11,15 +11,17 @@ describe 'openstack::provision' do describe 'should be possible to override resize_available' do let :params do { - :configure_tempest => true, - :resize_available => true, - :version_to_test => 'stable/grizzly' + :configure_tempest => true, + :resize_available => true, + :change_password_available => true, + :version_to_test => 'stable/grizzly' } end it { should contain_class('tempest').with( - :resize_available => true, - :version_to_test => 'stable/grizzly' + :resize_available => true, + :change_password_available => true, + :version_to_test => 'stable/grizzly' ) } end