openstack/puppet-openstack-integration
Code Issues Proposed changes

Enable Volume encryption testing again

Browse Source 
Change-Id: I5566d1aea8a8393ffed0601b12986e2e4676ea59
This commit is contained in:
Emilien Macchi 2016-08-30 15:07:40 -04:00 committed by David Moreau Simard
parent 30f1541da1
commit b674d6c97c
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/cinder.pp
View File

@ -63,8 +63,8 @@ class openstack_integration::cinder (
debug => true, debug => true,
} }
if $volume_encryption { if $volume_encryption {
$keymgr_api_class = 'cinder.keymgr.barbican.BarbicanKeyManager' $keymgr_api_class = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
$keymgr_encryption_api_url = "${::openstack_integration::config::base_url}:9311/v1" $keymgr_encryption_api_url = "${::openstack_integration::config::base_url}:9311"
$keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3" $keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3"
} else { } else {
$keymgr_api_class = undef $keymgr_api_class = undef
@ -83,10 +83,9 @@ class openstack_integration::cinder (
default_volume_type => 'BACKEND_1', default_volume_type => 'BACKEND_1',
public_endpoint => "${::openstack_integration::config::base_url}:8776", public_endpoint => "${::openstack_integration::config::base_url}:8776",
service_name => 'httpd', service_name => 'httpd',
# TODO(emilien) Re-enable later when things are stable again. keymgr_api_class => $keymgr_api_class,
# keymgr_api_class => $keymgr_api_class, keymgr_encryption_api_url => $keymgr_encryption_api_url,
# keymgr_encryption_api_url => $keymgr_encryption_api_url, keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
# keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
} }
include ::apache include ::apache
class { '::cinder::wsgi::apache': class { '::cinder::wsgi::apache':

5
run_tests.sh
View File

@ -205,10 +205,7 @@ echo "api.baremetal.admin.test_drivers" >> /tmp/openstack/tempest/test-whitelist
echo "v2.test_queues.TestManageQueue" >> /tmp/openstack/tempest/test-whitelist.txt echo "v2.test_queues.TestManageQueue" >> /tmp/openstack/tempest/test-whitelist.txt
# Cinder encrypted volumes # Cinder encrypted volumes
# TODO(emilien) re-enable it when those 2 patches are merged: TESTS="${TESTS} TestEncryptedCinderVolumes"
# - https://review.openstack.org/#/c/358670/
# - https://review.openstack.org/#/c/359391/
# TESTS="${TESTS} TestEncryptedCinderVolumes"
print_header 'Running Tempest' print_header 'Running Tempest'
cd /tmp/openstack/tempest cd /tmp/openstack/tempest