openstack/puppet-tempest
Code Issues Proposed changes

Merge "Add config parameters to run Keystone v3 tests"

Browse Source
This commit is contained in:
Jenkins
2015-07-27 21:21:09 +00:00
committed by Gerrit Code Review
parent 3c939852ef 5d69c28185
commit 7507b4bca6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -32,6 +32,7 @@ class tempest(
# tempest.conf parameters
#
$identity_uri = undef,
$identity_uri_v3 = undef,
$cli_dir = undef,
$lock_path = '/var/lib/tempest',
$debug = false,
@@ -52,6 +53,7 @@ class tempest(
$admin_password = undef,
$admin_tenant_name = undef,
$admin_role = undef,
$admin_domain_name = undef,
# image information
$image_ref = undef,
$image_ref_alt = undef,
@@ -80,6 +82,7 @@ class tempest(
$swift_available = false,
$keystone_v2 = true,
$keystone_v3 = true,
$auth_version = 'v2',
) {
include '::tempest::params'
@@ -160,13 +163,16 @@ class tempest(
'identity/admin_tenant_name': value => $admin_tenant_name;
'identity/admin_username': value => $admin_username;
'identity/admin_role': value => $admin_role;
'identity/admin_domain_name': value => $admin_domain_name;
'identity/alt_password': value => $alt_password, secret => true;
'identity/alt_tenant_name': value => $alt_tenant_name;
'identity/alt_username': value => $alt_username;
'identity/password': value => $password, secret => true;
'identity/tenant_name': value => $tenant_name;
'identity/uri': value => $identity_uri;
'identity/uri_v3': value => $identity_uri_v3;
'identity/username': value => $username;
'identity/auth_version': value => $auth_version;
'identity-feature-enabled/api_v2': value => $keystone_v2;
'identity-feature-enabled/api_v3': value => $keystone_v3;
'network/public_network_id': value => $public_network_id;

3
spec/classes/tempest_spec.rb
View File

@@ -162,10 +162,12 @@ describe 'tempest' do
is_expected.to contain_tempest_config('compute/resize_available').with(:value => nil)
is_expected.to contain_tempest_config('compute/allow_tenant_isolation').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_password').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_domain_name').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_password').with_secret( true )
is_expected.to contain_tempest_config('identity/admin_tenant_name').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_username').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_role').with(:value => nil)
is_expected.to contain_tempest_config('identity/auth_version').with(:value => 'v2')
is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil)
is_expected.to contain_tempest_config('identity/alt_password').with_secret( true )
is_expected.to contain_tempest_config('identity/alt_tenant_name').with(:value => nil)
@@ -174,6 +176,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('identity/password').with_secret( true )
is_expected.to contain_tempest_config('identity/tenant_name').with(:value => nil)
is_expected.to contain_tempest_config('identity/uri').with(:value => nil)
is_expected.to contain_tempest_config('identity/uri_v3').with(:value => nil)
is_expected.to contain_tempest_config('identity/username').with(:value => nil)
is_expected.to contain_tempest_config('identity-feature-enabled/api_v2').with(:value => true)
is_expected.to contain_tempest_config('identity-feature-enabled/api_v3').with(:value => true)