openstack/puppet-openstack-integration
Code Issues Proposed changes

Add Ceph Luminous support for CentOS 7 CI

Browse Source 
Change-Id: Idf3287b13d8a1508ad1dc3fad498a8eb0259ebf4
Depends-On: Ia5db0bcc884d47c918c7da6657aa5b9bfdcdce44
This commit is contained in:
Mohammed Naser 2017-09-27 12:43:16 -04:00
parent 8334c21dcc
commit 005097530a
No known key found for this signature in database
GPG Key ID: 481CBC90384AEC42
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure_facts.sh
View File

@ -26,7 +26,7 @@ if [ -f /etc/ci/mirror_info.sh ]; then
if uses_debs; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/ceph-deb-jewel"
else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/7/storage/x86_64/ceph-jewel/"
CEPH_MIRROR_HOST="${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/storage/x86_64/ceph-luminous/"
fi
else
CENTOS_MIRROR_HOST='http://mirror.centos.org'
@ -36,7 +36,7 @@ else
if uses_debs; then
CEPH_MIRROR_HOST='https://download.ceph.com/debian-jewel'
else
CEPH_MIRROR_HOST='http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/'
CEPH_MIRROR_HOST='https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/'
fi
fi

8
manifests/ceph.pp
View File

@ -70,13 +70,7 @@ class openstack_integration::ceph (
$ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi']
ceph::pool { $ceph_pools: }
# NOTE(mnaser): At the moment, the storage SIG packages do not ship 12.X
# however UCA is shipping it at the moment. This conditional
# should be dropped once we switch CentOS to 12.X
if $::osfamily != 'RedHat' {
class { '::ceph::profile::mgr': }
}
class { '::ceph::profile::mgr': }
class { '::ceph::profile::mon': }
class { '::ceph::profile::osd': }

2
manifests/repos.pp
View File

@ -38,7 +38,7 @@ class openstack_integration::repos {
},
},
}
$ceph_mirror = pick($::ceph_mirror_host, 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/')
$ceph_mirror = pick($::ceph_mirror_host, 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/')
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL.
# https://wiki.centos.org/SpecialInterestGroup/Storage/
if $::operatingsystem == 'CentOS' {