openstack/puppet-openstack-integration
Code Issues Proposed changes

Align the stars to promote Ci to latest Newton

Browse Source 
1) Promote RDO to latest trunk
2) Configure puppet-keystone to manage credentials, as it's now required
   by keystone upstream.
3) Run Zaqar tests against API v2 (1.0 is deprecated and 1.1 will be
   deprecated soon).

Depends-On: I364f65c7009e400f2851e37999e1d8c0b6f5fd5a
Change-Id: I967038c872628a5a290e2890641c9c8dac45588d
This commit is contained in:
Emilien Macchi 2016-09-05 14:44:14 -04:00
parent 6f7e0766ea
commit f0203d99a2
3 changed files with 24 additions and 15 deletions

35
manifests/keystone.pp

@ -38,25 +38,34 @@ class openstack_integration::keystone (
$enable_fernet_setup = false $enable_fernet_setup = false
} }
# Keystone credential setup is not packaged in UCA yet.
# It should be done when Newton is released.
if $::operatingsystem == 'CentOS' {
$enable_credential_setup = true
} else {
$enable_credential_setup = false
}
class { '::keystone::client': } class { '::keystone::client': }
class { '::keystone::cron::token_flush': } class { '::keystone::cron::token_flush': }
class { '::keystone::db::mysql': class { '::keystone::db::mysql':
password => 'keystone', password => 'keystone',
} }
class { '::keystone': class { '::keystone':
debug => true, debug => true,
database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone', database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
admin_token => 'a_big_secret', admin_token => 'a_big_secret',
enabled => true, enabled => true,
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,
enable_ssl => $::openstack_integration::config::ssl, enable_ssl => $::openstack_integration::config::ssl,
public_bind_host => $::openstack_integration::config::host, public_bind_host => $::openstack_integration::config::host,
admin_bind_host => $::openstack_integration::config::host, admin_bind_host => $::openstack_integration::config::host,
manage_policyrcd => true, manage_policyrcd => true,
token_provider => $token_provider, token_provider => $token_provider,
enable_fernet_setup => $enable_fernet_setup, enable_fernet_setup => $enable_fernet_setup,
enable_credential_setup => $enable_credential_setup,
} }
include ::apache include ::apache
class { '::keystone::wsgi::apache': class { '::keystone::wsgi::apache':

2
manifests/repos.pp

@ -31,7 +31,7 @@ class openstack_integration::repos {
manage_epel => false, manage_epel => false,
repo_hash => { repo_hash => {
'newton-current' => { 'newton-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/8e/99/8e9986665cd960b47914b969c34e4ea9240c10ba_e74e2f6e/', 'baseurl' => 'https://trunk.rdoproject.org/centos7-master/a1/31/a131f4efa0ab549bfd8d11e13e86d7fa09df3dce_5f3ecf31/',
'descr' => 'Newton current', 'descr' => 'Newton current',
'gpgcheck' => 'no', 'gpgcheck' => 'no',
'priority' => 1, 'priority' => 1,

2
run_tests.sh

@ -194,7 +194,7 @@ TESTS="${TESTS} gnocchi.tempest"
TESTS="${TESTS} api.baremetal.admin.test_drivers" TESTS="${TESTS} api.baremetal.admin.test_drivers"
# Zaqar # Zaqar
TESTS="${TESTS} TestManageQueue" TESTS="${TESTS} v2.test_queues.TestManageQueue"
# Cinder encrypted volumes # Cinder encrypted volumes
# TODO(emilien) re-enable it when those 2 patches are merged: # TODO(emilien) re-enable it when those 2 patches are merged: