Merge "keystone: stop configuring paste_config"
This commit is contained in:
commit
fc9bc3fc84
@ -30,11 +30,6 @@ class openstack_integration::keystone (
|
|||||||
service_name => 'httpd',
|
service_name => 'httpd',
|
||||||
default_domain => $default_domain,
|
default_domain => $default_domain,
|
||||||
using_domain_config => $using_domain_config,
|
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
|
include ::apache
|
||||||
class { '::keystone::wsgi::apache':
|
class { '::keystone::wsgi::apache':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user