Update openstack_extras to 322d8c6ba409a4b486be0fb62fda54286dbf15ca

322d8c6ba409a4b486be0fb62fda54286dbf15ca Expose uca_location to override mirror location

Change-Id: Ia63beb91dc8af473427b9e52499c767e04a5ec7a

Puppetfile

@@ -167,7 +167,7 @@ mod 'opendaylight',
   :git => 'https://github.com/dfarrell07/puppet-opendaylight.git'
 
 mod 'openstack_extras',
-  :commit => 'c7002ebb4c92521cbab46158c9350d79036fbda6',
+  :commit => '322d8c6ba409a4b486be0fb62fda54286dbf15ca',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',

openstack_extras/manifests/repo/debian/ubuntu.pp

@@ -37,13 +37,18 @@
 #   installing any packages.
 #   Defaults to false
 #
+# [*uca_location*]
+#   (optional) Ubuntu Cloud Archives repository location.
+#   Defaults to $::openstack_extras::repo::debian::params::uca_location
+#
 class openstack_extras::repo::debian::ubuntu(
   $release         = $::openstack_extras::repo::debian::params::release,
   $manage_uca      = true,
   $repo            = 'updates',
   $source_hash     = {},
   $source_defaults = {},
-  $package_require = false
+  $package_require = false,
+  $uca_location    = $::openstack_extras::repo::debian::params::uca_location,
 ) inherits openstack_extras::repo::debian::params {
   if $manage_uca {
     exec { 'installing ubuntu-cloud-keyring':
@@ -56,7 +61,7 @@
       notify      => Exec['apt_update'],
     }
     apt::source { $::openstack_extras::repo::debian::params::uca_name:
-      location => $::openstack_extras::repo::debian::params::uca_location,
+      location => $uca_location,
       release  => "${::lsbdistcodename}-${repo}/${release}",
       repos    => $::openstack_extras::repo::debian::params::uca_repos,
     }

openstack_extras/releasenotes/notes/allow_change_uca_url-b855c119a693b583.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - When deploying UCA repositories, allow to customize the URL.

openstack_extras/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb

@@ -131,11 +131,12 @@
 
     describe 'with overridden uca repo name' do
       let :params do
-        default_params.merge!({ :repo => 'proposed' })
+        default_params.merge!({ :repo => 'proposed',
+                                :uca_location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive' })
       end
 
       it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
-        :location           => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+        :location           => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
         :release            => 'trusty-proposed/liberty',
         :repos              => 'main',
       )}