diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index 0032e3666..227f935a1 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.pp
@@ -26,7 +26,7 @@ case $::osfamily {
   'RedHat': {
     $ipv6               = true
     $zaqar_enabled      = true
-    $barbican_enabled   = true
+    $barbican_enabled   = false
   }
   default: {
     fail("Unsupported osfamily (${::osfamily})")
diff --git a/manifests/barbican.pp b/manifests/barbican.pp
index ed07a557b..cb6676fec 100644
--- a/manifests/barbican.pp
+++ b/manifests/barbican.pp
@@ -44,6 +44,7 @@ class openstack_integration::barbican {
   class { '::barbican::api::logging':
     debug => true,
   }
+  # TODO(iurygregory): update configuration to authtoken schema
   class { '::barbican::api':
     host_href                   => "${::openstack_integration::config::base_url}:9311",
     auth_type                   => 'keystone',