From e398bfdfbf41174e8e27b5b09631b01abd50bb26 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 3 Apr 2018 13:44:31 +0200 Subject: [PATCH] Use Debian's repo when using Debian manifests/repos.pp was using UCA also when setting-up under Debian. Change-Id: If83a0c4999e6eb54d61d2b4a8fbcac793b6b7ebb --- manifests/repos.pp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index 1ed0b99da..88ce78c66 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -2,11 +2,25 @@ class openstack_integration::repos { case $::osfamily { 'Debian': { - include ::apt - class { '::openstack_extras::repo::debian::ubuntu': - release => 'queens', - package_require => true, - uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'), + case $::operatingsystem { + 'ubuntu': { + include ::apt + class { '::openstack_extras::repo::debian::ubuntu': + release => 'queens', + package_require => true, + 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 # Official packages are on ceph.com so we want to make sure