repos: deploy newton repo on ubuntu xenial

First try to deploy OpenStack Newton on Ubuntu Xenial.

Depends-On: I2ad1b7ee1b9e3f23e37e4053751ca794e5107e73
Change-Id: I67d9cd9e22742659afd2fe2b1991c3ffd3e15c22
This commit is contained in:
Emilien Macchi 2016-06-09 09:52:32 -04:00 committed by iberezovskiy
parent 22c29c79ac
commit db9eb98232
3 changed files with 27 additions and 0 deletions

View File

@ -67,6 +67,19 @@ class openstack_integration::keystone (
ssl_cert => $::openstack_integration::params::cert_path,
workers => 2,
}
# Workaround to purge Keystone vhost that is provided & activated by default with running
# Canonical packaging (called 'keystone').
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
ensure_resource('file', '/etc/apache2/sites-available/keystone.conf', {
'ensure' => 'absent',
})
ensure_resource('file', '/etc/apache2/sites-enabled/keystone.conf', {
'ensure' => 'absent',
})
Package['keystone'] -> File['/etc/apache2/sites-available/keystone.conf']
-> File['/etc/apache2/sites-enabled/keystone.conf'] ~> Anchor['keystone::install::end']
}
class { '::keystone::roles::admin':
email => 'test@example.tld',
password => 'a_big_secret',

View File

@ -9,6 +9,12 @@ class openstack_integration::repos {
release => 'mitaka',
package_require => true,
}
} else {
class { '::openstack_extras::repo::debian::ubuntu':
release => 'newton',
repo => 'updates',
package_require => true,
}
}
# Ceph is both packaged on UCA & ceph.com
# Official packages are on ceph.com so we want to make sure

View File

@ -76,6 +76,14 @@ class openstack_integration::tempest (
include ::openstack_integration::config
include ::openstack_integration::params
# Install missed dependency for neutron tests
# https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
package { ['python-ddt', 'python-oslotest']:
ensure => present
}
}
class { '::tempest':
debug => true,
use_stderr => false,