repos: bump RDO to latest OpenStack commit

RDO did not promote packaging since some time, so we continue to update
repos.pp manually with recent commits, so we can move forward into
Mitaka cycle.

Setting paste_config to 'keystone-paste.ini' in ::keystone, since RDO is now using
/etc/keystone/keystone-paste.ini and not
/usr/share/keystone/keystone-paste.ini by default.

Change-Id: I8ab741c91a73bb3d016fd4c23664e44f6bdf473a
This commit is contained in:
Emilien Macchi 2016-02-17 08:30:23 -05:00
parent becca2e139
commit e98749b983
2 changed files with 6 additions and 1 deletions

View File

@ -30,6 +30,11 @@ 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':

View File

@ -23,7 +23,7 @@ class openstack_integration::repos {
manage_rdo => false,
repo_hash => {
'mitaka-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7/d8/94/d89421705607af3db74a839c4ce24299eabf4d47_5eb3a4f1/',
'baseurl' => 'https://trunk.rdoproject.org/centos7/b4/77/b47704d4dee98cb031c06fed779f1e7c3e4c4dc8_d4d8381d/',
'descr' => 'Mitaka Current',
'gpgcheck' => 'no',
'priority' => 1,