5e4701a4f2
Currently we are suffering from a flakey cinder test due to an issue with the RDO provided PyMySQL package and a recent change I4e5440b8450558add372214fd1a0373ab4ad2434. To unblock the Puppet OpenStack modules, this change adds a pending repo to the tests. This change should be reverted after a newer version of PyMySQL is included in the RDO packages. Additionally, we were improperly enabling ipv6 on ubuntu for scenario004 despite the fact the README said it should not be enabled. This change also disables ipv6 on ubuntu so scenario004 will pass. Change-Id: I752592a37786b17c5aeb409a048b98f97ca0fc31 Related-Bug: #1641312
67 lines
2.0 KiB
Puppet
67 lines
2.0 KiB
Puppet
class openstack_integration::repos {
|
|
|
|
case $::osfamily {
|
|
'Debian': {
|
|
include ::apt
|
|
class { '::openstack_extras::repo::debian::ubuntu':
|
|
release => 'newton',
|
|
package_require => true,
|
|
uca_location => $::uca_mirror_host,
|
|
}
|
|
# Ceph is both packaged on UCA & ceph.com
|
|
# Official packages are on ceph.com so we want to make sure
|
|
# Ceph will be installed from there.
|
|
apt::pin { 'ceph':
|
|
priority => 1001,
|
|
origin => 'download.ceph.com',
|
|
}
|
|
}
|
|
'RedHat': {
|
|
class { '::openstack_extras::repo::redhat::redhat':
|
|
manage_rdo => false,
|
|
manage_epel => false,
|
|
repo_hash => {
|
|
'ocata-puppet-passed-ci' => {
|
|
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/',
|
|
'descr' => 'Ocata puppet-passed-ci',
|
|
'gpgcheck' => 'no',
|
|
'priority' => 1,
|
|
},
|
|
'ocata-delorean-deps' => {
|
|
'baseurl' => 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-ocata',
|
|
'descr' => 'Ocata delorean-deps',
|
|
'gpgcheck' => 'no',
|
|
'priority' => 1,
|
|
},
|
|
'rdo-pending' => {
|
|
'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-common-pending/x86_64/os/',
|
|
'descr' => 'RDO pending LP1641312',
|
|
'gpgcheck' => 'no',
|
|
'priority' => '1',
|
|
},
|
|
},
|
|
}
|
|
}
|
|
default: {
|
|
fail("Unsupported osfamily (${::osfamily})")
|
|
}
|
|
}
|
|
|
|
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL.
|
|
# https://wiki.centos.org/SpecialInterestGroup/Storage/
|
|
if $::operatingsystem == 'CentOS' {
|
|
$enable_sig = true
|
|
$enable_epel = false
|
|
} else {
|
|
$enable_sig = false
|
|
$enable_epel = true
|
|
}
|
|
|
|
class { '::ceph::repo':
|
|
enable_sig => $enable_sig,
|
|
enable_epel => $enable_epel,
|
|
ceph_mirror => $::ceph_mirror_host,
|
|
}
|
|
|
|
}
|