summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Rizvan <srizvan@mirantis.com>2017-06-09 18:38:19 +0300
committerSergii Rizvan <srizvan@mirantis.com>2017-06-15 09:56:09 +0000
commit245539ea9fa29e5c46e95947e77f64c62bb0daee (patch)
tree490e5768354def11b47c2e204a757e77a8d107b0
parent442f6a0ed7d039bfacd752cd2c96634e6ee61083 (diff)
Clean up keystone.conf file
At the end of keystone.conf file there were some options from keystone-paste.ini file. These options don't affect anything that's why they were removed in order to clean up keystone.conf Change-Id: Ib388c37ac4f622cabc405a4d83ba71f2f35b7e83 Closes-Bug: #1693188
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Workflow+1: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 19 Jun 2017 07:55:32 +0000 Reviewed-on: https://review.openstack.org/474529 Project: openstack/fuel-library Branch: refs/heads/master
-rw-r--r--deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp31
1 files changed, 0 insertions, 31 deletions
diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
index 95b4098..fcf54cb 100644
--- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
@@ -346,37 +346,6 @@ class openstack_tasks::keystone::keystone {
346 } 346 }
347 } 347 }
348 348
349 keystone_config {
350 'identity/driver': value =>'keystone.identity.backends.sql.Identity';
351 'ec2/driver': value =>'keystone.contrib.ec2.backends.sql.Ec2';
352 'filter:debug/paste.filter_factory': value =>'keystone.common.wsgi:Debug.factory';
353 'filter:token_auth/paste.filter_factory': value =>'keystone.middleware:TokenAuthMiddleware.factory';
354 'filter:admin_token_auth/paste.filter_factory': value =>'keystone.middleware:AdminTokenAuthMiddleware.factory';
355 'filter:xml_body/paste.filter_factory': value =>'keystone.middleware:XmlBodyMiddleware.factory';
356 'filter:json_body/paste.filter_factory': value =>'keystone.middleware:JsonBodyMiddleware.factory';
357 'filter:user_crud_extension/paste.filter_factory': value =>'keystone.contrib.user_crud:CrudExtension.factory';
358 'filter:crud_extension/paste.filter_factory': value =>'keystone.contrib.admin_crud:CrudExtension.factory';
359 'filter:ec2_extension/paste.filter_factory': value =>'keystone.contrib.ec2:Ec2Extension.factory';
360 'filter:s3_extension/paste.filter_factory': value =>'keystone.contrib.s3:S3Extension.factory';
361 'filter:url_normalize/paste.filter_factory': value =>'keystone.middleware:NormalizingFilter.factory';
362 'filter:stats_monitoring/paste.filter_factory': value =>'keystone.contrib.stats:StatsMiddleware.factory';
363 'filter:stats_reporting/paste.filter_factory': value =>'keystone.contrib.stats:StatsExtension.factory';
364 'app:public_service/paste.app_factory': value =>'keystone.service:public_app_factory';
365 'app:admin_service/paste.app_factory': value =>'keystone.service:admin_app_factory';
366 'pipeline:public_api/pipeline': value =>'stats_monitoring url_normalize token_auth admin_token_auth xml_body json_body debug ec2_extension user_crud_extension public_service';
367 'pipeline:admin_api/pipeline': value =>'stats_monitoring url_normalize token_auth admin_token_auth xml_body json_body debug stats_reporting ec2_extension s3_extension crud_extension admin_service';
368 'app:public_version_service/paste.app_factory': value =>'keystone.service:public_version_app_factory';
369 'app:admin_version_service/paste.app_factory': value =>'keystone.service:admin_version_app_factory';
370 'pipeline:public_version_api/pipeline': value =>'stats_monitoring url_normalize xml_body public_version_service';
371 'pipeline:admin_version_api/pipeline': value =>'stats_monitoring url_normalize xml_body admin_version_service';
372 'composite:main/use': value =>'egg:Paste#urlmap';
373 'composite:main//v2.0': value =>'public_api';
374 'composite:main//': value =>'public_version_api';
375 'composite:admin/use': value =>'egg:Paste#urlmap';
376 'composite:admin//v2.0': value =>'admin_api';
377 'composite:admin//': value =>'admin_version_api';
378 }
379
380 class { '::keystone::endpoint': 349 class { '::keystone::endpoint':
381 public_url => $public_url, 350 public_url => $public_url,
382 admin_url => $admin_url, 351 admin_url => $admin_url,