From a8a04c3d6c3f2926b4650df97e5cd9a4c3fa979a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 2 Oct 2016 18:29:21 -0400 Subject: [PATCH] Pin Ubuntu repositories to stable Newton packaging Pin Ubuntu repositories to stable Newton packaging. Change-Id: Id61a070d5143c8337c307640824efc1be3b3fa04 --- manifests/repos.pp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index 9142c0fd8..97adf37b8 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -3,19 +3,10 @@ class openstack_integration::repos { case $::osfamily { 'Debian': { include ::apt - # Mitaka is already packaged in 16.04, so we don't need UCA. - if ($::operatingsystem == 'Ubuntu') and ! (versioncmp($::operatingsystemmajrelease, '16') >= 0) { - class { '::openstack_extras::repo::debian::ubuntu': - release => 'mitaka', - package_require => true, - } - } else { - class { '::openstack_extras::repo::debian::ubuntu': - release => 'newton', - repo => 'updates', - package_require => true, - uca_location => $::uca_mirror_host, - } + class { '::openstack_extras::repo::debian::ubuntu': + release => 'newton', + package_require => true, + uca_location => $::uca_mirror_host, } # Ceph is both packaged on UCA & ceph.com # Official packages are on ceph.com so we want to make sure