openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "ubuntu: re-enable barbican"

Browse Source
This commit is contained in:
Jenkins 2016-12-05 10:31:45 +00:00 committed by Gerrit Code Review
commit 6f1aa6133a
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fixtures/scenario002.pp
View File

@ -17,15 +17,11 @@
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false
# we'll start testing barbican after Newton stable, Ubuntu packaging is not # ec2api is not packaged on UCA
# updated enough.
$barbican_enabled = false
# ec2api is not packaged on Ubuntu Trusty
$ec2api_enabled = false $ec2api_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$barbican_enabled = true
$ec2api_enabled = true $ec2api_enabled = true
} }
default: { default: {
@ -61,17 +57,15 @@ include ::openstack_integration::mongodb
include ::openstack_integration::provision include ::openstack_integration::provision
class { '::openstack_integration::nova': class { '::openstack_integration::nova':
volume_encryption => $barbican_enabled, volume_encryption => true,
} }
class { '::openstack_integration::cinder': class { '::openstack_integration::cinder':
volume_encryption => $barbican_enabled, volume_encryption => true,
cinder_backup => 'swift', cinder_backup => 'swift',
} }
if $barbican_enabled { include ::openstack_integration::barbican
include ::openstack_integration::barbican
}
if $ec2api_enabled { if $ec2api_enabled {
include ::openstack_integration::ec2api include ::openstack_integration::ec2api
@ -83,6 +77,6 @@ class { '::openstack_integration::tempest':
swift => true, swift => true,
ironic => true, ironic => true,
zaqar => true, zaqar => true,
attach_encrypted_volume => $barbican_enabled, attach_encrypted_volume => true,
ec2api => $ec2api_enabled, ec2api => $ec2api_enabled,
} }