openstack/puppet-openstack-integration
Code Issues Proposed changes

Separate RHEL from Ubuntu code and fix Ubuntu ceph default repo url.

Browse Source 
The ceph repo for Ubunto was broken and pointed to
http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/dists/xenial/main/binary-amd64/Packages
[1].

Furthermore epel activation/deactivation makes no sense on Ubuntu
platform.

[1] http://logs.openstack.org/65/432165/19/check/gate-puppet-vswitch-puppet-beaker-rspec-ubuntu-xenial/daad266/console.html#_2017-04-03_05_13_45_306095

Closes-Bug: #1678932

Change-Id: I5d3c75b14145d3f55eec5f019b962cc4888404e5
This commit is contained in:
Sofer Athlan-Guyot
2017-04-03 10:15:36 +02:00
committed by Emilien Macchi
parent 8c2ea5b414
commit f11afc4ff3
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/repos.pp
View File

@@ -15,6 +15,9 @@ class openstack_integration::repos {
priority => 1001, priority => 1001,
origin => 'download.ceph.com', origin => 'download.ceph.com',
} }
$enable_sig = false
$enable_epel = false
$ceph_mirror = pick($::ceph_mirror_host, 'http://download.ceph.com/debian-jewel/')
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
@@ -35,26 +38,26 @@ class openstack_integration::repos {
}, },
}, },
} }
$ceph_mirror = pick($::ceph_mirror_host, 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/')
# 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
}
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") 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': class { '::ceph::repo':
enable_sig => $enable_sig, enable_sig => $enable_sig,
enable_epel => $enable_epel, enable_epel => $enable_epel,
ceph_mirror => pick($::ceph_mirror_host, 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/'), ceph_mirror => $ceph_mirror,
} }
} }