From 5b99b531da38e1730193d11d416906943d3fcbee Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 6 Apr 2018 10:27:22 -0600 Subject: [PATCH] Cleanup deb_location The deb_location is not used in params and the documentation for the debian repo has been updated. Change-Id: If430ad3a1c086fb4c22fd122f13a78dacfa7a11a --- manifests/repo/debian/debian.pp | 5 ++--- manifests/repo/debian/params.pp | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/manifests/repo/debian/debian.pp b/manifests/repo/debian/debian.pp index 7f7ae3b..f1408d3 100644 --- a/manifests/repo/debian/debian.pp +++ b/manifests/repo/debian/debian.pp @@ -32,14 +32,13 @@ # # [*deb_location*] # (optional) Debian package repository location. -# Defaults to $::openstack_extras::repo::debian::params::deb_location +# Defaults to "http://${::lsbdistcodename}-${release}.debian.net/debian" # # === DEPRECATED # # [*manage_whz*] # (optional) Whether or not to add the default Debian Stretch APT source -# Replaced by $manage_deb instead. -# Defaults to true +# Replaced by $manage_deb. # class openstack_extras::repo::debian::debian( $release = $::openstack_extras::repo::debian::params::release, diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp index 753493a..f008c80 100644 --- a/manifests/repo/debian/params.pp +++ b/manifests/repo/debian/params.pp @@ -12,7 +12,6 @@ class openstack_extras::repo::debian::params $uca_required_packages = 'ubuntu-cloud-keyring' $deb_name = 'debian-openstack-backports' - $deb_location = "http://${::lsbdistcodename}-${release}.debian.net/debian" $deb_repos = 'main' $deb_required_packages = 'openstack-backports-archive-keyring' }