From b29f4ab14d6499346e2e88422c4f726283bf2606 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 10 Feb 2021 16:55:55 +0000
Subject: [PATCH] Pin get-pip.py to last Python 3.5 version

We only support Puppet versions available for platforms up through
Ubuntu Xenial, which provides Python 3.5 as its python3 interpreter.
Recently pip, and by extension get-pip.py, ceased supporting Python
<3.6 but added stable URLs for the last releases to support earlier
interpreters. Switch to the URL for a get-pip.py which will still
work for Xenial servers.

Also fix a couple of new linter failures.

Change-Id: I042bfc330e4d562313cf0dbf2be7d0e2d5779f40
---
 manifests/init.pp    | 2 +-
 manifests/params.pp  | 2 +-
 manifests/python3.pp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 786eb5c..ebfb55f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,7 @@ class pip (
   $optional_settings = {},
   $trusted_hosts     = [],
 ) {
-  include ::pip::params
+  include pip::params
   validate_array($trusted_hosts)
 
   package { $::pip::params::python_devel_package:
diff --git a/manifests/params.pp b/manifests/params.pp
index 66df637..eea8049 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,7 @@
 # This class holds parameters that need to be
 # accessed by other classes.
 class pip::params {
-  $get_pip_location = 'https://bootstrap.pypa.io/get-pip.py'
+  $get_pip_location = 'https://bootstrap.pypa.io/3.5/get-pip.py'
 
   case $::osfamily {
     'RedHat': {
diff --git a/manifests/python3.pp b/manifests/python3.pp
index 284e537..38a2412 100644
--- a/manifests/python3.pp
+++ b/manifests/python3.pp
@@ -1,7 +1,7 @@
 # Class: pip
 #
 class pip::python3 {
-  include ::pip::params
+  include pip::params
 
   package { $::pip::params::python3_devel_package:
     ensure => present,