From 3841839f90c9d4c49820e41d853cf063acd884f1 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 22 Feb 2016 15:40:44 -0500
Subject: [PATCH] keystone: stop configuring paste_config
Thanks to https://review.openstack.org/#/c/280385 - the paste_config
parameter is now well set by default for both Red Hat & Ubuntu systems.
So no needs to set it in integration manifests.
Change-Id: I01a7d9f567e51ded68ea323e863878dce49ffc9b
Depends-On: I3987c254bdafe9fb23266da2fff2e21d1cd0cec3
---
manifests/keystone.pp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index 4b75aff4d..6b8a632e7 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -30,11 +30,6 @@ class openstack_integration::keystone (
service_name => 'httpd',
default_domain => $default_domain,
using_domain_config => $using_domain_config,
- # RDO is now using default value (keystone-paste.ini)
- # so we make sure the value is undef for both distros.
- # once this patch will be merged, we'll patch puppet-keystone to drop default in params.pp
- # and drop this parameter here.
- paste_config => 'keystone-paste.ini',
}
include ::apache
class { '::keystone::wsgi::apache':