From 94cf6945b5cc1d500c6077ed12d4f8abc58d7a3d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 31 Mar 2017 09:31:40 -0400 Subject: [PATCH] repos: use pick to fallback on real mirror (beaker jobs) Beaker jobs don't exectute run_tests.sh so they can't find the actual mirror that needs to be used in OpenStack Infra. Let's use pick so we can fallback to the rdoproject server on that case. Change-Id: I9fcfed06fbad0a2c1a82133dcf727ac2f8eaca9e --- manifests/repos.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index b2c4ea10a..8b837caf8 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -6,7 +6,7 @@ class openstack_integration::repos { class { '::openstack_extras::repo::debian::ubuntu': release => 'pike', package_require => true, - uca_location => $::uca_mirror_host, + uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'), } # Ceph is both packaged on UCA & ceph.com # Official packages are on ceph.com so we want to make sure @@ -22,7 +22,7 @@ class openstack_integration::repos { manage_epel => false, repo_hash => { 'pike-puppet-passed-ci' => { - 'baseurl' => $::rdo_mirror_host, + 'baseurl' => pick($::rdo_mirror_host, 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/'), 'descr' => 'Pike puppet-passed-ci', 'gpgcheck' => 'no', 'priority' => 1, @@ -53,7 +53,7 @@ class openstack_integration::repos { class { '::ceph::repo': enable_sig => $enable_sig, enable_epel => $enable_epel, - ceph_mirror => $::ceph_mirror_host, + ceph_mirror => pick($::ceph_mirror_host, 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-jewel/'), } }