openstack/puppet-openstack-integration
Code Issues Proposed changes

Use Debian's repo when using Debian

Browse Source 
manifests/repos.pp was using UCA also when setting-up under Debian.

Change-Id: If83a0c4999e6eb54d61d2b4a8fbcac793b6b7ebb
This commit is contained in:
Thomas Goirand 2018-04-03 13:44:31 +02:00
parent 26e37b055b
commit e398bfdfbf
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/repos.pp
View File

@ -2,12 +2,26 @@ class openstack_integration::repos {
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
case $::operatingsystem {
'ubuntu': {
include ::apt include ::apt
class { '::openstack_extras::repo::debian::ubuntu': class { '::openstack_extras::repo::debian::ubuntu':
release => 'queens', release => 'queens',
package_require => true, package_require => true,
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'), uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
} }
}
'debian': {
include ::apt
class { '::openstack_extras::repo::debian::debian':
release => 'queens',
package_require => true,
}
}
default: {
fail("Unsupported operatingsystem (${::operatingsystem})")
}
}
# Ceph is both packaged on UCA & ceph.com # Ceph is both packaged on UCA & ceph.com
# Official packages are on ceph.com so we want to make sure # Official packages are on ceph.com so we want to make sure
# Ceph will be installed from there. # Ceph will be installed from there.