From 3b8ce128aeae850026129207ca233e698482cb85 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Fri, 15 Sep 2017 09:31:22 -0400
Subject: [PATCH] keystone: run credential setup on xenial
The credential configuration was not packaged back in Newton,
it's now here and we can test it now.
Change-Id: I95a7490e3ed7f781d4cecfe15754432834a7c812
---
manifests/keystone.pp | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index e0ea544df..39cdabb9a 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -71,14 +71,6 @@ class openstack_integration::keystone (
$enable_fernet_setup = false
}
- # Keystone credential setup is not packaged in UCA yet.
- # It should be done when Newton is released.
- if $::osfamily == 'RedHat' {
- $enable_credential_setup = true
- } else {
- $enable_credential_setup = false
- }
-
class { '::keystone::client': }
class { '::keystone::cron::token_flush': }
class { '::keystone::db::mysql':
@@ -99,7 +91,6 @@ class openstack_integration::keystone (
manage_policyrcd => true,
token_provider => $token_provider,
enable_fernet_setup => $enable_fernet_setup,
- enable_credential_setup => $enable_credential_setup,
fernet_max_active_keys => '4',
token_expiration => $token_expiration,
default_transport_url => os_transport_url({