openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Disable barbican"

Browse Source
This commit is contained in:
Jenkins 2016-08-15 16:56:23 +00:00 committed by Gerrit Code Review
commit da748ad437
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixtures/scenario002.pp
View File

@ -26,7 +26,7 @@ case $::osfamily {
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$zaqar_enabled = true $zaqar_enabled = true
$barbican_enabled = true $barbican_enabled = false
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")

1
manifests/barbican.pp
View File

@ -44,6 +44,7 @@ class openstack_integration::barbican {
class { '::barbican::api::logging': class { '::barbican::api::logging':
debug => true, debug => true,
} }
# TODO(iurygregory): update configuration to authtoken schema
class { '::barbican::api': class { '::barbican::api':
host_href => "${::openstack_integration::config::base_url}:9311", host_href => "${::openstack_integration::config::base_url}:9311",
auth_type => 'keystone', auth_type => 'keystone',