Refactor UCA pins and package configuration
After moving UCA to a separate release, repo config can be managed by nailgun in the release repo list. Repo configuration and repo pin itself are now removed, but package pins remain. Also removed pin workaround for keystoneclient. Change-Id: I3a03e2c02074fe14c85666def121c5c36dda9f74 Partial-Bug: #1556011
This commit is contained in:
Matthew Mosesohn
parent
65183330f4
commit
416db0f3cc
|
|
@ -0,0 +1,78 @@
|
|||
# == Class: osnailyfacter::package_pins
|
||||
#
|
||||
# Class which allows upstream OpenStack repositories
|
||||
# to be configured, plus additional workarounds, such
|
||||
# as APT pinning.
|
||||
#
|
||||
# == Parameters
|
||||
#
|
||||
# [*repo_type*]
|
||||
# A string containing upstream repository type.
|
||||
#
|
||||
# [*pin_haproxy*]
|
||||
# Boolean for pinning HAProxy to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_rabbitmq*]
|
||||
# Boolean for pinning RabbitMQ to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_ceph*]
|
||||
# Boolean for pinning Ceph to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_priority*]
|
||||
# A string containing the APT pin priority for all overridden packages.
|
||||
# Defaults to 2000.
|
||||
#
|
||||
# [*ceph_packages*]
|
||||
# Array of all ceph related packages. Used only when pin_ceph is true.
|
||||
#
|
||||
#
|
||||
|
||||
class osnailyfacter::package_pins (
|
||||
$repo_type = unset,
|
||||
$pin_haproxy = false,
|
||||
$pin_rabbitmq = false,
|
||||
$pin_ceph = false,
|
||||
$pin_priority = '2000',
|
||||
$ceph_packages = ['ceph', 'ceph-common', 'libradosstriper1', 'python-ceph',
|
||||
'python-rbd', 'python-rados', 'python-cephfs', 'libcephfs1', 'librados2',
|
||||
'librbd1', 'radosgw', 'rbd-fuse']
|
||||
) {
|
||||
|
||||
if $repo_type == 'uca' {
|
||||
|
||||
#FIXME(mattmyo): derive versions via fact or hiera
|
||||
if $pin_haproxy {
|
||||
apt::pin { 'haproxy-mos':
|
||||
packages => 'haproxy',
|
||||
version => '1.5.3-*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
if $pin_ceph {
|
||||
apt::pin { 'ceph-mos':
|
||||
packages => $ceph_packages,
|
||||
version => '0.94*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
if $pin_rabbitmq {
|
||||
apt::pin { 'rabbitmq-server-mos':
|
||||
packages => 'rabbitmq-server',
|
||||
version => '3.6*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
apt::pin { 'openvswitch-mos':
|
||||
packages => 'openvswitch*',
|
||||
version => '2.4.0*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
package { 'ubuntu-cloud-keyring':
|
||||
ensure => 'present',
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,151 +0,0 @@
|
|||
# == Class: osnailyfacter::upstream_repo_setup
|
||||
#
|
||||
# Class which allows upstream OpenStack repositories
|
||||
# to be configured, plus additional workarounds, such
|
||||
# as APT pinning.
|
||||
#
|
||||
# == Parameters
|
||||
#
|
||||
# [*repo_type*]
|
||||
# A string containing upstream repository type.
|
||||
#
|
||||
# [*uca_repo_url*]
|
||||
# A string containing the URL for Ubuntu Cloud Archive repository.
|
||||
#
|
||||
# [*debian_repo_url*]
|
||||
# A string containing the URL for Debian backports repository.
|
||||
#
|
||||
# [*repo_priority*]
|
||||
# A string containing the APT priority for the configured repo.
|
||||
# Defaults to '9000'.
|
||||
#
|
||||
# [*os_release*]
|
||||
# A string containing the repo name for the OpenStack release.
|
||||
# Defaults to 'mitaka'.
|
||||
#
|
||||
# [*pin_haproxy*]
|
||||
# Boolean for pinning HAProxy to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_rabbitmq*]
|
||||
# Boolean for pinning RabbitMQ to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_ceph*]
|
||||
# Boolean for pinning Ceph to use Fuel repository instead.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*pin_priority*]
|
||||
# A string containing the APT pin priority for all overridden packages.
|
||||
# Defaults to 2000.
|
||||
#
|
||||
# [*ceph_packages*]
|
||||
# Array of all ceph related packages. Used only when pin_ceph is true.
|
||||
#
|
||||
#
|
||||
|
||||
class osnailyfacter::upstream_repo_setup (
|
||||
$repo_type = unset,
|
||||
$uca_repo_url = unset,
|
||||
$debian_repo_url = unset,
|
||||
$repo_priority = '1140',
|
||||
$os_release = 'mitaka',
|
||||
$pin_haproxy = false,
|
||||
$pin_rabbitmq = false,
|
||||
$pin_ceph = false,
|
||||
$pin_priority = '2000',
|
||||
$ceph_packages = ['ceph', 'ceph-common', 'libradosstriper1', 'python-ceph',
|
||||
'python-rbd', 'python-rados', 'python-cephfs', 'libcephfs1', 'librados2',
|
||||
'librbd1', 'radosgw', 'rbd-fuse']
|
||||
) {
|
||||
|
||||
if $repo_type == 'uca' {
|
||||
|
||||
#FIXME(mattmyo): derive versions via fact or hiera
|
||||
if $pin_haproxy {
|
||||
apt::pin { 'haproxy-mos':
|
||||
packages => 'haproxy',
|
||||
version => '1.5.3-*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
if $pin_ceph {
|
||||
apt::pin { 'ceph-mos':
|
||||
packages => $ceph_packages,
|
||||
version => '0.94*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
if $pin_rabbitmq {
|
||||
apt::pin { 'rabbitmq-server-mos':
|
||||
packages => 'rabbitmq-server',
|
||||
version => '3.6*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
apt::pin { 'openvswitch':
|
||||
packages => 'openvswitch*',
|
||||
version => '2.4.0*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
# FIXME(mattymo): wait for uca to bump keystoneclient
|
||||
apt::pin { 'python-oslo.config':
|
||||
packages => 'python-oslo.config',
|
||||
version => '3.4.0*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
# FIXME(mattymo): wait for uca to bump keystoneclient
|
||||
apt::pin { 'python-keystoneclient':
|
||||
packages => 'python-keystoneclient',
|
||||
version => '2.1.1*',
|
||||
priority => $pin_priority,
|
||||
}
|
||||
}
|
||||
|
||||
case $repo_type {
|
||||
'fuel': {
|
||||
notice('No repo changes needed for Fuel repo type.')
|
||||
}
|
||||
'uca': {
|
||||
$release = "${::lsbdistcodename}-updates/${os_release}"
|
||||
$provider = "${::lsbdistcodename}-updates"
|
||||
$repo_name = 'UCA'
|
||||
$originator = 'Canonical'
|
||||
package { 'ubuntu-cloud-keyring':
|
||||
ensure => 'present',
|
||||
require => APT::Source[$repo_name],
|
||||
}
|
||||
$repo_url = $uca_repo_url
|
||||
package { 'python-amqp':
|
||||
ensure => latest,
|
||||
require => APT::Source[$repo_name],
|
||||
}
|
||||
}
|
||||
'debian': {
|
||||
$release = $os_release
|
||||
$provider = $os_release
|
||||
$repo_name = 'debian_trusty'
|
||||
$originator = 'Debian'
|
||||
$repo_url = $debian_repo_url
|
||||
}
|
||||
default: {
|
||||
fail("Invalid repo type ${repo_type}")
|
||||
}
|
||||
}
|
||||
|
||||
if $repo_type != 'fuel' {
|
||||
apt::source { $repo_name:
|
||||
location => $repo_url,
|
||||
release => $release,
|
||||
repos => 'main'
|
||||
}
|
||||
|
||||
apt::pin { $repo_name:
|
||||
packages => '*',
|
||||
release => $provider,
|
||||
originator => $originator,
|
||||
codename => $release,
|
||||
priority => $repo_priority,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,10 +4,8 @@ $repo_setup_hash = hiera_hash('repo_setup', {})
|
|||
$repos = $repo_setup_hash['repos']
|
||||
$repo_type = pick($repo_setup_hash['repo_type'], 'fuel')
|
||||
|
||||
class { '::osnailyfacter::upstream_repo_setup':
|
||||
class { '::osnailyfacter::package_pins':
|
||||
repo_type => $repo_type,
|
||||
uca_repo_url => $repo_setup_hash['uca_repo_url'],
|
||||
os_release => $repo_setup_hash['uca_openstack_release'],
|
||||
pin_haproxy => $repo_setup_hash['pin_haproxy'],
|
||||
pin_rabbitmq => $repo_setup_hash['pin_rabbitmq'],
|
||||
pin_ceph => $repo_setup_hash['pin_ceph'],
|
||||
|
|
@ -46,4 +44,5 @@ if $::osfamily == 'Debian' {
|
|||
}
|
||||
|
||||
Apt::Source<||> ~> Exec<| title == 'apt_update' |>
|
||||
Exec<| title == 'apt_update' |> -> Package<||>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,11 @@ describe manifest do
|
|||
end
|
||||
|
||||
if repo_type != 'fuel'
|
||||
it 'uca repository should be configured' do
|
||||
should contain_apt__source('UCA').with({
|
||||
location => uca_repo_url,
|
||||
})
|
||||
it 'uca package pins should be configured' do
|
||||
should contain_apt__pin('haproxy-mos')
|
||||
should contain_apt__pin('ceph-mos')
|
||||
should contain_apt__pin('rabbitmq-server-mos')
|
||||
should contain_apt__pin('openvswitch-mos')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue